025-3 & 057-1:

	* Added collision at 057-1 108,39.
	* moved tile from Over to Ground2 at 057-1 65,49.
	* Added black tile to over at 025-3 157,83.
bugs reported by straelyn
Added water cave tile and two lilypads to Woodland_ground tileset
055-1 & 055-3:

055-1:
	* Moved warp 100,82 to 100,83.
	* because warp on 055-3 was moved, warp on 055-1 to 055-3 had to be edited.

055-3:
	* Fixed warp offset at 98,114.
	* Added south cave exit tiles to Over.
	* moved warp from 50,42 to 50,43.
011-1, 018-1, 018-3:

011-1:
	* Fixed part of Oscar's House in 011-1.
	* updated minimap.

018-1:
	* moved all x1 tiles from Fringe to Ground2.
	* Fixed overlap to 011-1 regarding changes on 011-1.
	* repaired the roof of the Woodland Mining Camp Indoors.
	* added a "To" to the name of the warps to 018-2.
	* removed some dirt tiles at 35,0.
	* updated minimap.
	* removed collision at:
		47,62
		46/47 ,64
		50, 66/67
		129,96
		54,79
		54-59,80

018-3:
	* moved all x1 tiles from Fringe to Ground2.
	* overwrote tiles 90,100 - 96,108 - 103,108 - 110,49 with floor tiles on Ground.
trapper daily quest: add trapper NPC, ID 377
Updating license.txt.
New cave tilesets: cave2_bilevel.png, cave2_bilevel_water_lava.png, cave2.png, cave2_sewer_mine.png, cave2_sewer_mine_x2.png, cave2_sewer_mine_x3.png, cave2_sewer_mine_x4.png, cave2_sewers.png, cave2_transistions.png, cave2_x2.png, cave2_x3.png
Edited Desert2 to add the sewer entrance
Map edits for new caves.
Map edits to set all layers the same.
added 021-3 sewers
added 002-2 Malvox house
added 002-3 mining camp
added 043-1 new area for slime quest
added 043-3 new dungeon for slime quest
moved old 002-3,002-4 down one level
added sewer entrances to 021-2
adding new particle effects for new mobs angry fire goblin, angry green slime, angry sea slime
adding new mobs angry fire gobline, angry sea slime, angry green slime
adding new NPC supply chest to replace the treasure chest in the mines.
 and all the liscene file changes for all the art in previous commits
Merge remote-tracking branch 'wushin/tonori-cave-release'

Conflicts:
license.txt: graphics/tiles/Woodland_ground.png was changed in master
    added also enchilado here, since that edit was forgotten
npcs.xml: id conflict with trapper and supply chest, moved supply chest down to 378
Tulimshar Sewers Warp fix
Update minimaps of maps related to recent changes
018-3: fixed tileset issue.
fix syntax error in maps.xml.
tile fixes
collision on palm trees on 002-1
Over tiles by west entrance on 021-3
Merge pull request #16 from wushin/master

Cave Release fixes
Update license file for Nami's graphics, since he agreed to dual licensing.