Merge branch 'master' into develop
- referencing issue #74
Conflicts:
	Gruntfile.coffee
	bower.json
	dist/angular-google-maps.js
	dist/angular-google-maps.min.js
	example/example.html
	package.json
	spec/coffee/directives/api/models/parent/marker-parent-model.spec.coffee
	src/coffee/directives/api/models/parent/marker-parent-model.coffee