add clean url's to user
Merge branch 'dev'