Upgrade to Rails 4
Merge branch 'rails-4'

Conflicts:
	best_in_place.gemspec