qaz
Merge branch 'master' of OpenHomeT

Conflicts:
	JSPch6/nbproject/project.properties
	Servletch5/nbproject/project.properties