Merge branch 'master' into develop
Fixed some asset pipeline issues
Merge branch 'develop'