Merge branch 'master' of https://github.com/oeon/PasoRoblesAVA

Conflicts:
	ava_polygon.geojson
conflict res