Login branch

pulling login branch into master