-fixed login
Merge remote-tracking branch 'origin/Ofer'