Merge first into HEAD

Conflicts:
	src/java/Converters/ClientConverter.java