Modification of the EventManager + Log to work with PHP 5.3
Update phpdoc
Merge pull request #345 from stefk/master

Removed composer.lock and linked to new setting checker
Merge
Merge remote-tracking branch 'upstream/alt-master'

Conflicts:
	.gitignore
	.gitmodules
	README.md
	app/config/platform_options.yml
	app/dev/raw_install
Merge remote-tracking branch 'upstream/master'
Merge pull request #348 from maxailloud/master

Remove execution right on config files
New logo and platform configuration
move logos to uploads directory
move logos to uploads directory
move logos to uploads directory
track gitignore sub file
git ignore fix
delete subdirectory git ignore
Merge remote-tracking branch 'upstream/master' into alt-master

Conflicts:
	.gitignore
Merge pull request #349 from solispauwels/alt-master

New logo and platform configuration
Removed reference to deleted css file (closes #351)
Merge remote-tracking branch 'upstream/master'