Re-arrange assets
Merge branch 'master' into dev
Add lots of assets