Merge branch 'develop' of https://github.com/Make-Magazine/makerapp into develop

Conflicts:
	app/views/shared/_main_nav.html.erb
	config/routes.rb
Update merge with new UI
Merge branch 'develop' of https://github.com/Make-Magazine/makerapp into develop

Conflicts:
	app/views/shared/_main_nav.html.erb
	config/routes.rb