Begin testing new navigation configurations
Still failing on nav updates
Merge branch 'master' of https://github.com/whmii/SuperDry

Conflicts:
	app/templates/includes/navigation.hbs
Clean up