Merge branch 'hotfix/sessionbug'
reset waiting time when login successful
Merge branch 'hotfix/waitingtimereset' into develop