merging maptesting
Merge branch 'dev' of https://github.com/Mathias-Gartner/Battle-of-Conquest into dev