Merge origin/first into first

Conflicts:
	src/java/Converters/ClientConverter.java