Fix Server crash problem #5
Merge branch 'master' into 1.5.2
Merge branch '1.5.2' into 1.4.7

Conflicts:
	src/org/yogpstop/qp/client/ClientProxy.java
Merge branch '1.4.7' into 1.4.5

Conflicts:
	src/org/yogpstop/qp/TileMarker.java