Upgrade rails
Merge branch 'master' of github.com:unepwcmc/mypolygon-v2

Conflicts:
	Gemfile
	Gemfile.lock