Cihad is da

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