fix login issue
Fix Bugs on login/register process and other minors bugs
Merge