Create wangwangwang

?
Merge branch 'Glassices' into develop
Merge branch 'develop' of https://github.com/glassices/Schedule into develop
Merge branch 'Glassices' into develop
Merge branch 'Glassices' into develop
Merge branch 'Glassices' into develop

Conflicts:
timeshaftitem.cpp
fixed conflict
1