Minor changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/classes/edutechonline/test/suites/WebTests.class