merged two asset building scripts
Merge branch 'develop'