Merge pull request #11 from tombatossals/master

Merge with original
Merge pull request #12 from tombatossals/master

Merge with original
Merge pull request #13 from flibbertigibbet/master

Add UTFGrid Support
Add mapbox layer
Add support for cartodb tiles (CartoDB Map API)
Add user options for layers
Add support for cartodb utfgrid (CartoDB Map API)
Globalize utfGridCreateLayer
fix cartodb utf grid error
Add support for cartodb interactive layer (CartoDB Map API)
Add custom options for layer controller
Add metadata for legend
Fix error: #447
updated version of karma-jasmine
Merge branch 'master' of https://github.com/elesdoar/angular-leaflet-directive into elesdoar-master

Conflicts:
	src/services/leafletLayerHelpers.js
Merge branch 'elesdoar-master'