Merge branch 'develop'
fix 5
Merge branch 'develop'
+ check time and count to user
Merge branch 'master' into develop