[Widelands-dev] [Merge] lp:~widelands-dev/widelands/soldier-capacity-ctrl into lp:widelands

Continuous integration builds have changed state: Travis build 4673. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/516239713. Appveyor build 4459. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_soldier_ca

[Widelands-dev] [Merge] lp:~nordfriese/widelands/workareas into lp:widelands

Continuous integration builds have changed state: Travis build 4672. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/516235502. Appveyor build 4458. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_nordfriese_widelands_workareas-445