Updated rails so we don't get bitten by the JSON bug.

CVE-2013-0276
CVE-2013-0277

http://weblog.rubyonrails.org/2013/2/11/SEC-ANN-Rails-3-2-12-3-1-11-and-2-3-17-have-been-released/
Updated rails so we don't get bitten by the JSON bug.
  CVE-2013-0276
  CVE-2013-0277

  http://weblog.rubyonrails.org/2013/2/11/SEC-ANN-Rails-3-2-12-3-1-11-and-2-3-17-have-been-released/

Merge branch 'master' of https://github.com/kandanapp/kandan

Conflicts:
	Gemfile.lock