Signed-off-by: xx313only <xx313only@hotmail.com>
Signed-off-by: onlinever-demon <xx313only@hotmail.com>
Signed-off-by: onlinever-demon <xx313only@hotmail.com>
Signed-off-by: onlinever-demon <xx313only@hotmail.com>
Merge branch 'master' of
https://github.com/onlinever/onlinever_server.git

Conflicts:
	WebRoot/view/page/layout/head.html
	WebRoot/view/page/login.html
	src/com/onlinever/usercenter/handler/impl/GatewayHandler.java