Upgraded rails version to 4.1.1
Merge branch 'master' of https://github.com/ziggurat/prodetotal2