Fix #22
Integrated citymediaride
Merge branch 'master' of github.com:Bype/citymedia into zoom_one