fixed update issue on order page and removed double error message on login
Merge remote-tracking branch 'origin/master' into Saumya