Adding Google base layer option
Removing url as required from google type base layers
Merge branch 'pulls/google-base-layer' into develop