assets separated
Merge branch 'assets_separated'