Move assets to /app because of asset-pack defaults
Merge from master