GEOWAVE-122
Merge pull request #123 from ngageoint/GEOWAVE-122

GEOWAVE-122
Merge branch 'master' into GEOWAVE-121-packaging