updated fixes
update
Merge branch 'master' into redhook_staticcontent

Conflicts:
	app/js/angular-leaflet-directive.js
	app/js/controllers.js