people search and welcome page mobile compatible
Merge branch 'master' into mobile_support_with_failback_spike

Conflicts:
	app/controllers/people_controller.rb
	app/controllers/welcome_controller.rb
	config/initializers/mime_types.rb
pulling changes from master