fixed assets container
Merge branch 'development'