update rails
missing icon
Merge branch 'development'