fix bug.
Merge branch 'develop' into housekeeping
housekeeping at timer
housekeeping at timer
housekeeping at ranking
housekeeping at square!
housekeeping
housekeeping
Merge branch 'housekeeping' into develop