layout
Merge branch 'develop' of https://github.com/creativeondemand/MiCamel_US_100114 into develop

Conflicts:
	app/storage/logs/laravel.log