rake assets
Merge branch 'develop'