Rails upgrade
Merge branch 'master' of github.com:unepwcmc/NBSAP-Landing

Conflicts:
	Gemfile
	Gemfile.lock