Fix more something
Merge branch 'master' into 1.5.2

Conflicts:
	src/org/yogpstop/qp/TileBasic.java
	src/org/yogpstop/qp/TilePump.java