New branch for new release 2
Merge branch 'master' into r2.1

Conflicts:
	TestApp/src/Door.java