set login button
Merge branch 'master' into Blake
login stuff
Merge branch 'Blake'