changed routes to match rest resources (session and user)
Merge remote-tracking branch 'origin/dev' into dev