hot fix sorting out ugly urls
Merge branch 'hotfix-url'
adding quotes controller
Merge branch 'hotfix-url'