update to rails 4.1.0
Merge branch 'development'