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

Conflicts:
	ConquestServer/src/conquest/server/classes/MySqlConnection.java