code review changes: use conventional changes, routeHelper < controllers
fix files
change up
Merge branch 'master' of https://github.com/Fittr/fittr into dev
Merge pull request #126 from Hendrixer/dev

code cleanup