Wut
Merge branch 'master' of https://github.com/pgerlich/conquestOnline

Conflicts:
	Conquest/.classpath