created option to change map type
Merge remote-tracking branch 'Places/master' into CustomBranch