Temp fix annotate gem
Upgrade simple form
Update account settings view
Add new wallpaper hint
Update bootstrap to 3.1.1
Merge branch 'simple-form-3.1.0'