Rails3
Merge branch 'Rails4'

Conflicts:
	config/environments/production.rb