Esri/joint-military-symbology-xml — pull request #51 by abouffard (2014-05-08 05:57:56+00:00)
Title: Fixed the conflicts

This should incorporate Joe's changes.