gamemap and tile editted
Merge branch 'master' of https://github.com/shuse2/ConquerWar

Conflicts:
	Classes/GameMap.cpp
	Classes/GameMap.h