no message
Merge branch 'master' of https://github.com/AntonBos/CCI

Conflicts:
	app/views/frontend/test.blade.php