qqq
qqq
Merge branch 'master' of https://github.com/allen4z/Gogo

Conflicts:
	Gogo/WebRoot/WEB-INF/classes/com/gogo/ctrl/LoginController.class
	Gogo/WebRoot/view/jsp/main.jsp