Assets update
Merge branch 'heroku'