Add submenus to navigation bar
Merge branch 'drop-down-menus'

Conflicts:
	head.php
	header.php