bundle update rails -> 4.1.1
Merge branch 'development'