Merge branch 'master' into develop
postbuild
Merge branch 'develop' into beta

Conflicts:
	dist/angular-google-maps.min.js
	dist/angular-google-maps_dev_mapped.js.map
	dist/angular-google-maps_dev_mapped.min.js
	dist/angular-google-maps_dev_mapped.min.js.map