Changed name of teststate to gamestate
updated map object with new object mapfeature and tiles
Merge branch 'master' of https://github.com/MattNewbill/android_combat_game