Update gems
Update gems
Merge branch 'master' into rails4

Conflicts:
	Gemfile.lock
Update gems
More rails4 preparations
Update assets
Update gems
Merge branch 'master' into rails4