config
t2
t2_1
Merge branch 'master' of https://github.com/faboloused/OpenHomeT

Conflicts:
	.gitignore
	JSPch6/nbproject/project.properties
	JSPch6/web/WEB-INF/web.xml
	Servletch5/nbproject/project.properties
	Servletch5/web/WEB-INF/glassfish-web.xml