create/edit pois via osm api
Merge branch 'master' of github.com:mapzen/poipond

Conflicts:
	Gemfile