Formulated URL service to use current matched route parameters
Merge branch 'develop' into user
Fixed typos
Merge branch 'develop' into user
Code cleaning up
Merge branch 'develop' into user