Redoing the 'master' branch env
New demo models + LICENSE file
Upgrade to version 1.0.4
Now error reporting for master branch
New error reporting for master
Corrections in gitignore and Sami config
Merge branch 'master' into wip

Conflicts:
	demo/index.php