Update poi_types
Merge branch 'master' of https://github.com/osmandapp/OsmAnd-resources

Conflicts:
	poi/poi_types.xml
Update poi types