Update gems
Update mail gem
Update gems
Merge branch 'master' into rails4

Conflicts:
	Gemfile
	Gemfile.lock