Login Logic Completed, Security Issue Starts
merge complete. Conflicts on UserInfo.java