branch test partial test
Merge branch 'branchtest1'

Conflicts:
	tilestest1/src/main/webapp/WEB-INF/views/home.jsp