Merge branch 'master' into develop
remove extra files
Merge branch 'develop'