Update paths to assets.
Merge branch 'development'