clear public assets
Merge branch 'development'