change error display
playerId change to userId

Signed-off-by: owwlo <owwlo@163.com>
Merge branch 'login-page' of https://github.com/lisajluo/smg-server into login-page
success info display
Merge branch 'login-page' of ssh://git@github.com/lisajluo/smg-server.git into login-page
wait after success
theme for passwordReset

Signed-off-by: owwlo <owwlo@163.com>
Merge branch 'login-page' of https://github.com/lisajluo/smg-server into login-page
main page test

Signed-off-by: fei <1450622282@qq.com>
Merge branch 'login-page' of https://github.com/lisajluo/smg-server into login-page
email type

Signed-off-by: fei <1450622282@qq.com>
change url for test

Signed-off-by: owwlo <owwlo@163.com>
logic fix for mainPage

Signed-off-by: owwlo <owwlo@163.com>
fix for mainPage

Signed-off-by: owwlo <owwlo@163.com>
clean up
Merge branch 'login-page' of https://github.com/lisajluo/smg-server into login-page
fix in CORSUtil and logoutRedirect

Signed-off-by: owwlo <owwlo@163.com>
change url for deploying

Signed-off-by: owwlo <owwlo@163.com>
Merge remote-tracking branch 'origin/login-page'