Update Gems. Adds JSON Gem.

JSON Gem 1.7.7 added to fix CVE-2013-0269
Merge branch 'develop' of github.com:tech-angels/slanger into develop

Conflicts:
	Gemfile.lock