changes of logged in page
Merge branch 'master' of https://github.com/nucleusgroup/asterix

Conflicts:
	app/views/layouts/default.blade.php
included home1.blade.php