Merge branch 'master' into 'master'

python-api-src/lib_unittype.cpp

python-api-src/library.cpp

src/BaseLocation.cpp

src/BaseLocationManager.cpp

src/BuildingPlacer.cpp

src/CMakeLists.txt

src/IDABot.cpp

src/IDABot.h

src/MapTools.cpp

src/MapTools.h

src/TechTree.cpp

src/TechTree.json

src/Unit.cpp

src/Unit.h

src/UnitType.cpp

src/UnitType.h