rename rvm gemset
remove rvm gemset
Merge branch 'develop'

Conflicts:
	.ruby-gemset