Adds some more areas
Merge branch 'master' of https://github.com/a12tdt4240/grotrisk.git

Conflicts:
	Test Game/test-game-android/assets/data/json/map.default.json
Merge branch 'master' of https://github.com/a12tdt4240/grotrisk.git
Adds back classpath to avoid problems
Adds initialization of neighborsMap