compiling the assets
Merge branch 'b_assets_deploy' into development
Merge branch 'development'