 Merge branch 'develop' into 'master'
 Merge branch 'develop' into 'master'

Develop

ngageoint/mage-server,ngageoint/mage-server,ngageoint/mage-server,jclark118/mage-server,newmanw/mage-server,jclark118/mage-server,ngageoint/mage-server,newmanw/mage-server,newmanw/mage-server,jclark118/mage-server