Merge branch 'landing-page' into develop

Conflicts:
	config/routes.rb
merge develop