Fixed merge conflict in UserManager.java
Created Login.xml and loginBB.java and made changes in UserManager.java