Merge branch 'xml' into 'units+xml'

src/config.cpp

src/config.hpp

src/level.cpp

src/main.cpp

src/unit.cpp

src/unit.hpp

xml/config.xml