rake assets:precompile
Merge branch 'development'