Fixed login problem partially. Still get an error for some people.
Merge remote-tracking branch 'origin/master'