Added LoginRegister widget.
fixed merge conflict
Merge branch 'login'