nav
Merge branch 'master' of https://github.com/16twenty/providr

Conflicts:
	app/views/admin/partial/footer.blade.php
	app/views/admin/partial/nav.blade.php