Asset configuration for heroku.
Merge branch 'master' into stable