Fix bad merge. Add gemset
Merge branch 'dev'

* dev:
  Fix bad merge. Add gemset

Conflicts:
	.ruby-gemset