Upgraded rails version to fix
https://groups.google.com/forum/#!topic/rubyonrails-security/61bkgvnSGTQ/discussion
Merge branch 'master' of github.com:unepwcmc/ipbes
Merge branch 'master' into db_timeouts