Merge branch 'feature/places-search-box' into develop
add author
Merge branch 'feature/places-search-box' into develop
check that bounds are an instance of LatLngBounds
version bump for snapshot
Merge branch 'master' into develop

Conflicts:
	bower.json
	dist/angular-google-maps.js
	dist/angular-google-maps.min.js
	package.json
Merge branch 'master' into develop

Conflicts:
	bower.json
	dist/angular-google-maps.js
	dist/angular-google-maps.min.js
	package.json
post merge update to dist
Merge branch 'master' into develop

Conflicts:
	dist/angular-google-maps.js
	dist/angular-google-maps.min.js
develop dist
Merge branch 'master' into develop

Conflicts:
	bower.json
	dist/angular-google-maps.js
	dist/angular-google-maps.min.js
	package.json
updated build via merge from master
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	bower.json
	dist/angular-google-maps.js
merged updates from master
Merge remote-tracking branch 'upstream/develop' into develop
merge upstream
$compile template on search directive to allow expressions in the placeholder value of the input field
default 'Search' text for example
Merge pull request #875 from kandizzy/develop

Allow expressions in the placeholder value in SearchBox templates
Merge branch 'master' into develop

Conflicts:
	bower.json
	dist/angular-google-maps.js
	package.json