add stop controller
merge
import geojson file
Merge pull request #53 from avilaton/stop-controller

Stop controller, closes #47