Modified for organization name change
Merge branch 'master' of https://github.com/umbrella-mvc/umbrella

Conflicts:
	composer.json