test
Merge branch 'nav'

Conflicts:
	app/views/admin/dashboard/main.blade.php