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

Conflicts:
	Gogo/WebRoot/view/jsp/main.jsp