Merge branch 'master' into develop
removed unnecessary import
finished class progress
Merge branch 'develop'