Fixed some issues/rigged dashboard
Merge branch 'master' of https://github.com/ThievingSix/UnksoAMI

Conflicts:
	app/routes.php
	app/views/master.blade.php