Merge branch 'master' of https://www.codecode.net/engintime-cs/teacher-group/shx/androidTest/tempgetwholesdk/ATimelessClassic