Lpis, RuianLands: Exclude landuse=military
Merge branch 'wayeditor-devel' into development
Merge remote-tracking branch 'upstream/development' into wayeditor-devel