User login branch merged with master

Fixed merge errors in previous pull request