use 1.9.3 locally
Updated gems
Merge branch 'master' into dockerize

Conflicts:
	Gemfile.lock