dev_deps.js
Merge remote-tracking branch 'upstream/master'

Conflicts:
	dist/angular-google-maps.min.js
	dist/angular-google-maps_dev_mapped.min.js
	dist/angular-google-maps_dev_mapped.min.js.map
Promise Async Fixes Break Compat with 1.2.X angular #1009
dev_deps.js reverted again
return val if promise.$$state
Merge pull request #1011 from kandizzy/master

Promise Async Compat with 1.2.X angular using $$v Issue, 1009
issue #975 example
example actually working like what was on the plunkr
issue 975 fixed
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