MapFactory generated Map w/area objects from json
Merge branch 'master' of https://github.com/a12tdt4240/grotrisk

Conflicts:
	Test Game/test-game/src/com/testgame/Models/Area.java