all monday
no change
Merge branch '27oct' into Develop

Conflicts:
	bin/.gitignore
	bin/nemmcommons/AllVariables.class
	debug.log
	src/nemmcommons/AllVariables.java
	velocity.log