bugfix for 912 and 884
Merge branch 'master' of https://github.com/alterm4nn/ChronoZoom into bugfixing1
Fixing friendlyURL encoding test