example.html fixed for 2.1.X

modelKeyComparison needs local scope and not /`@scope/`

build
show icon doesnt work on marker
fix js for chrome maybe repaint
build
Merge branch 'master' of github.com:angular-ui/angular-google-maps
Merge branch 'master' into develop

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
build
Merge branch 'develop' into nick_mc/modelKeyComparison_needs_local_scope

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
	example/assets/scripts/controllers/example.js
	example/example.html
merged

all built
changed the main example view to example.2_1_X.html to have less conflicts from master
save off
revert on example
Merge pull request #966 from nmccready/nick_mc/modelKeyComparison_needs_local_scope

2.1.X example fix, and modelKeyComparison require scope as an arg
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
synced