update

tomcat and glassfish versions
update

more files
Merge remote-tracking branch 'origin/master'

Conflicts:
	ClassExamples/StudentTest/nbproject/private/private.properties
	ClassExamples/StudentWeb/nbproject/private/private.properties
	ClassExamples/StudentWeb/nbproject/private/private.xml

	Ian/DigitalMediaStore/build/web/WEB-INF/classes/util/DatabaseResources.properties
	Ian/DigitalMediaStore/src/java/util/DatabaseResources.properties