Merge pull request #61 from kiselev-dv/master

Add bookmaker
Add clock
Added multivalue flag for cuisine, sport and route_ref moretags
Fix translation for estate_agent

Suggested by:	literan
Simplify hierarchy of road features/obstacles
Add toll booth
Add parking, parking_entrance
Смержился с мастером ErshKUS/osmCatalog

Merge remote-tracking branch 'upstream/master'

Conflicts:
	dictionary/dictionary_ru.json