refactored version
Merge branch 'develop'

Conflicts:
	.ruby-version
	Gemfile
	Gemfile.lock
	MIT-LICENSE
	Rakefile
	script/rails