Merge branch '1.4.7' into 1.4.5

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