Removed cyclic dependency between IdentityQuestGroup.java and IdentityQuestion.java
Few checks and resolved merge issues