edited routes & user controller
Merge branch 'dev' of https://github.com/mlfryman/dibster into dev