remove  url rewriting
Merge branch 'dev'