Merge origin/first into first

Conflicts:
	.gitignore
Merge origin/first into first

Conflicts:
	src/java/Converters/ClientConverter.java