Upgraded rails to 4.1.x
Merge branch 'messaging' of https://github.com/skillsesh/skillsesh-beta into messaging