double creation fix in MarkerChildModel that was resolved on master
Merge pull request #957 from nmccready/master_to_develop

double creation fix in MarkerChildModel that was resolved on master
Merge branch 'master' into develop

Conflicts:
	dist/angular-google-maps.js
	dist/angular-google-maps.min.js
	dist/angular-google-maps_dev_mapped.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
	src/coffee/directives/api/models/child/marker-child-model.coffee
dev build
Merge branch 'master' into develop

Conflicts:
	dist/angular-google-maps_dev_mapped.js.map
develop build post master merge
Merge branch 'master' into develop

Conflicts:
	dist/angular-google-maps.js
	dist/angular-google-maps.min.js
	dist/angular-google-maps_dev_mapped.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 with mappAll mrged
Add support for NPM releases
example.html fixed for 2.1.X

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

build
Merge branch 'master' into develop
fix repaints in chrome 38
Merge pull request #969 from angular-ui/aes/fix-repaint-chrome-38

fix repaints in chrome 38
Merge branch 'master' into develop
show icon doesnt work on marker
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