psr-0 fix
composer and app
Merge branch 'master' of https://github.com/LavaLite/cms

Conflicts:
	composer.json