Fixed bug with login page
Fixed bug with login page
Merge master to staging for version team city build 1.0.168