client side tiled layers
merged
fix makefile