Update Gemfile and bump to 2.2
Fixed some Rails4 deprecation errors on template#edit
There's probably not spaces in method names
Merge branch 'master' into rails-4.2

* master:
  There's probably not spaces in method names
  Fixed some Rails4 deprecation errors on template#edit
  Update Gemfile and bump to 2.2

Conflicts:
	Gemfile.lock