changed Gemfile
modified Gemfile
Merge branch 'snc'
modified Gemfile
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile
fixing versions
Fixed Readme
Fixed copyright on Readme
Merge branch 'master' into 2-3-stable