final squash
new squash
new squash
1
first merge getApplList & getApplListByGroupID
12
rename
rename#2
rename#3
Merge remote-tracking branch 'origin/AttemptToMerge' into DevelopCandidate2

Conflicts:
	entity/src/main/java/com/softserveinc/ita/entity/User.java
	interview-sheduller/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml
	pom.xml
	user-manager/pom.xml
	user-manager/src/main/java/com/softserveinc/ita/controller/UserController.java
	user-manager/src/main/java/com/softserveinc/ita/service/UserService.java
	user-manager/src/main/java/com/softserveinc/ita/service/impl/UserServiceImpl.java
	user-manager/src/main/resources/user-spring-config.xml
	user-manager/src/test/java/com/softserveinc/ita/dao/UserMockDAOTest.java
	user-manager/src/test/java/com/softserveinc/ita/mvc/BaseMVCTest.java
	user-manager/src/test/java/com/softserveinc/ita/mvc/UserTests.java
	user-manager/src/test/java/com/softserveinc/ita/service/BaseServiceTest.java
	user-manager/src/test/java/com/softserveinc/ita/service/UserServiceTest.java
merged with AttemptToMerge