Fixed composer.json to new repo
Updated composer to add new ui module
Merge branch 'master' of http://github.com/samsonos/cms

Conflicts:
	composer.json