fixed login routing
Merge remote-tracking branch 'origin/developmenttest' into development