Fixed Readme
Fixed Gemfile
Fixed copyright on Readme
Merge branch 'master' into 2-3-stable

Conflicts:
	Gemfile