add unique style for landuse military
Add preset for landuse=military
Improvements to land use preset display
Get military fill to show up in Firefox
Merge branch 'refs/heads/military-feature-fill'
resolve conflict