Update Headers and Navigation
Merge remote-tracking branch 'origin/master'

Conflicts:
	andrew-giang-application/views/include/nav.php
	root/css/main.css