Commit 3/21

Includes restructuring of WebMap Template, Toggle Layers Functionality,
Locator
Updated Working Desktop Verson