feature/UserManager/GetUserByID
Merge remote-tracking branch 'origin/feature/UserManager/GetUserByID' into DevelopCandidate2

Conflicts:
	entity/src/main/java/com/softserveinc/ita/entity/User.java
	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/resources/user-spring-config.xml
	user-manager/src/test/java/com/softserveinc/ita/dao/BaseDAOTest.java
	user-manager/src/test/java/com/softserveinc/ita/mvc/UserTests.java
	user-manager/src/test/java/com/softserveinc/ita/service/BaseServiceTest.java