Edited OaklandEstuary_aw
Merge branch 'FlexInnovate' of https://github.com/Innovate-Inc/arcgis-viewer-flex into FlexInnovate