Fixed cactus top

The cactus was on fringe, but the cliff on over. Moved the cactus to an
over layer to prevent the top from getting hidden under the cliff.

Also fixed small duplicate tile issue at the cliff next to the mine
entrance.
All warps moved from old to new style
Old style dest_x = <xtile_in_pixels>
New style dest_tile_x = <xtile>
Merge pull request #19 from Ablu/mine_entry_cactus_fix

002:-1 Fixed cactus top
Merge pull request #20 from wushin/warps-pixels-to-tiles

All warps moved from old to new style
Merge branch 'master' of https://github.com/themanaworld/tmwa-client-data into crypt

Conflicts:
	maps/027-3.tmx
	maps/027-4.tmx
various fixes