.
Merge branch 'test'

Conflicts:
	gittest/src/main/webapp/index.jsp