Nav bar setup
Merge branch 'subnav' into nav
Merge branch 'nav'

Conflicts:
	DZAKprototype1.xcodeproj/project.xcworkspace/xcuserdata/kyle_resse.xcuserdatad/UserInterfaceState.xcuserstate