Add menu icon and remove menu link. Add icon object for icons. Clean up.
Merge branch '1.3.1-LayerControl-Update' of https://github.com/cmv/cmv-app into develop