- Renames contextMenuToggleControl to toggleMapControl().
- Introduces blockedPoints and blockedAreas fields on scope.
Merge remote-tracking branch 'origin/master'