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

Conflicts:
	.classpath
	src/conversion/classes/ConversionHandler.java
	src/response/test/GetAnnotationInformationResponseTest.java
	src/server/Doorman.java