Support of roles in relations
Merge ../NAViTiA/third_party/osmpbfreader

Conflicts:
	osmpbfreader.h