Disabled leftover traces of grid movement plugin. Disabled enemy-to-enemy and player-to-player collisions. Fixed bug where unit sometimes snaps back one tile before destination.
Fixed bug with conflicting code where pressing escape on player unit's turn would reset unit's position for turn and toggle movement selection visuals, regardless if unit is selected.
Fixed bug where player unit would continuously move to destination if escape key is pressed during unit moving to destination. Fixed some incorrect variable references.
Fixed bug with undefined terrains. Updated battlefield map.
Merge branch 'master' of https://github.com/chessmasterhong/WaterEmblem

Conflicts:
	lib/game/entities/abstractities/base_player.js