fixing bluebird dependency for example.html for website
Merge branch 'master' into develop

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