Added MapType directive with tests + docs
Merge pull request #687 from Antwan86/feature/maptype-support

Feature : map-type directive support
Merge pull request #688 from kandizzy/develop

[Develop] trackFit (fit on marker array updates)
gitter chat room badge
Merge branch 'master' into develop

Conflicts:
	README.markdown
	dist/angular-google-maps.js
	dist/angular-google-maps.min.js
map-type fixed '^uiGmapgoogleMap' to '^uiGmapGoogleMap'
issue #667 with a few bug fixes for it
Add support for templates without an url

This time targeting the develop branch and simplifying the condition as show() is called everytime anyway
Merge pull request #700 from gitnik/template-develop

Add support for templates without an url
Fix destroy on already destroyed scope

It seems that when trying to destroy a lot of markers (and their scopes) at once, sometimes an already destroyed scope would get destroyed again, which obviously doesn't work. Simply wrapping the call in an if statement should be enough to fix this error
Fix destroy on already destroyed scope (develop)

It seems that when trying to destroy a lot of markers (and their scopes) at once, sometimes an already destroyed scope would get destroyed again, which obviously doesn't work. Simply wrapping the call in an if statement should be enough to fix this error
Merge pull request #701 from gitnik/destroy-fix

Fix destroy attempt on already destroyed scope
Merge pull request #702 from gitnik/destroy-fix-develop

Fix destroy on already destroyed scope (develop)
issue #622
save off issue-622 example/ investigation
Add support for templates without urls

Support loading of plain text templates with the url
Merge pull request #699 from gitnik/template

Add support for templates without urls
Merge branch 'master' into develop

Conflicts:
	dist/angular-google-maps.js
	dist/angular-google-maps.min.js
	src/coffee/directives/api/models/child/window-child-model.coffee
build after merge
Merge branch 'develop' into feature/develop/nmccready/issue-622-example
example finished example #662