tutorial complete
Merge remote-tracking branch 'origin/Tutorial'

Conflicts:
	GoUP/WebContent/WEB-INF/pages/home.jsp