Merge branch 'develop'
Fixed texture path problem
Merge branch 'hotfix-1.0.1' into develop