Design work
Merge branch 'master' of https://github.com/olsonkr/ApprovalApp

Conflicts:
	app/partials/controls/nav.html