Fixed a bug in the Angular Leaflet Directive
Merge branch 'develop-simpler' into gh-pages

Conflicts:
	js/angular-leaflet-directive.js
Merge branch 'develop-simpler' into gh-pages
(final) fix
Merge branch 'gh-pages' into develop-simpler