Smashed the Login and Register Bugs.
Merge remote-tracking branch 'origin/master'