map variable changes
Merge branch 'master' of https://github.com/tommaton/battlehack
map integration
Merge branch 'master' of https://github.com/tommaton/battlehack