bootstrap nav on both primary and secondary nav locations
Merge branch 'develop' of https://github.com/salcode/bootstrap-genesis into develop

Conflicts:
	lib/nav.php