homepage changes
Merge branch 'master' into sambox

Conflicts:
	app/controllers/pages_controller.rb
	app/views/pages/index.html.erb