Merge branch 'gh-pages' into develop-simpler
Fixed geojson.selected error
Merge branch 'develop-simpler' into gh-pages

Conflicts:
	js/angular-leaflet-directive.js