Updated Ruby and gems
Merge branch 'master' of github.com:foxdog-studios/citysdk-webservice-server

Conflicts:
	Gemfile
	Gemfile.lock