Multiple map controls and layers fixes.
Merge branch 'master' of github.com:SOLA-NEPAL/messaging