Changing assets compilation configuration
Merge branch 'development' into integration