Prepare pricing page
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/controllers/missions_controller.rb