Bugfix escape urls and merged master to develop

TODO:
* [x] test if this fixes http://plan.genialis.com/redmine/issues/3314