removed 2 unused vars in Controller and changed controlOptions
to layerControlLayerInfos so as to follow previous naming conventions.
Merge branch 'develop' of github.com:cmv/cmv-app into develop
fixed typo.