Merge branch 'master' into develop
remove extra files in common and numeric
Merge branch 'develop'