dao
Merge branch 'develop' into interview-manager

Conflicts:
	dao/src/test/resources/dao-test-context.xml
started interviewDAOTests
Merge branch 'develop' into interview-manager

Conflicts:
	dao/src/test/resources/dao-test-context.xml
	entity/src/main/java/com/softserveinc/ita/entity/QuestionInformation.java
6 hours of funny job
after funny funny happy work
lalala
Merge branch 'develop' into interview-manager
:))
lalala
merged with develop
Merge remote-tracking branch 'origin/develop' into feature/ApplicantsNotifications

Conflicts:
	InterviewFactory/pom.xml
	InterviewFactory/src/main/java/com/softserveinc/ita/interviewfactory/HttpRequestExecutorFactoryMock.java
	InterviewFactory/src/main/java/com/softserveinc/ita/interviewfactory/controller/InterviewController.java
	InterviewFactory/src/main/java/com/softserveinc/ita/interviewfactory/factory/InterviewWithStandardQuestions.java
	InterviewFactory/src/main/java/com/softserveinc/ita/interviewfactory/factory/InterviewWithUserAndStandardQuestions.java
	InterviewFactory/src/main/java/com/softserveinc/ita/interviewfactory/factory/InterviewWithoutQuestions.java
	InterviewFactory/src/main/java/com/softserveinc/ita/interviewfactory/service/mainServices/InterviewService.java
	InterviewFactory/src/main/java/com/softserveinc/ita/interviewfactory/service/mainServices/InterviewServiceMock.java
	InterviewFactory/src/main/java/com/softserveinc/ita/interviewfactory/service/questionInformationServices/QuestionsInformationServices.java
	InterviewFactory/src/main/java/com/softserveinc/ita/interviewfactory/service/questionInformationServices/QuestionsInformationServicesMock.java
	InterviewFactory/src/main/java/com/softserveinc/ita/interviewfactory/service/questionsBlocksServices/QuestionsBlockServices.java
	InterviewFactory/src/main/java/com/softserveinc/ita/interviewfactory/service/questionsBlocksServices/QuestionsBlockServicesMock.java
	InterviewFactory/src/main/java/exceptions/QuestionNotFoundException.java
	InterviewFactory/src/main/java/exceptions/QuestionsBlockNotFound.java
	InterviewFactory/src/main/resources/JsonTestInterviewWithStandardQuestions1.json
	InterviewFactory/src/main/resources/JsonTestInterviewWithStandardQuestions2.json
	InterviewFactory/src/main/resources/JsonTestInterviewWithUserAndStandardQuestions1.json
	InterviewFactory/src/main/resources/JsonTestInterviewWithUserAndStandardQuestions2.json
	InterviewFactory/src/main/resources/JsonTestInterviewWithoutQuestions1.json
	InterviewFactory/src/main/resources/JsonTestInterviewWithoutQuestions2.json
	InterviewFactory/src/main/resources/spring-config.xml
	InterviewFactory/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml
	InterviewFactory/src/main/webapp/WEB-INF/web.xml
	InterviewFactory/src/test/java/com/softserveinc/ita/factoryInterviewTests/BaseFactoryInterviewTests.java
	InterviewFactory/src/test/java/com/softserveinc/ita/factoryInterviewTests/FactoryInterviewTests.java
	InterviewFactory/src/test/java/com/softserveinc/ita/interviewingTests/BaseInterviewingTests.java
	InterviewFactory/src/test/java/com/softserveinc/ita/interviewingTests/InterviewingTests.java
	InterviewFactory/src/test/java/com/softserveinc/ita/mvc/BaseMVCTest.java
	InterviewFactory/src/test/java/com/softserveinc/ita/mvc/InterviewTests.java
	InterviewFactory/src/test/resources/spring-test-config.xml
	common/pom.xml
	common/src/main/java/com/softserveinc/ita/utils/impl/InterviewJsonUtilGsonImpl.java
	common/src/main/resources/spring-config.xml
	entity/src/main/java/com/softserveinc/ita/entity/Applicant.java
	entity/src/main/java/com/softserveinc/ita/entity/Appointment.java
	entity/src/main/java/com/softserveinc/ita/entity/Group.java
	entity/src/main/java/com/softserveinc/ita/entity/Interview.java
	entity/src/main/java/com/softserveinc/ita/entity/InterviewType.java
	entity/src/main/java/com/softserveinc/ita/entity/Question.java
	entity/src/main/java/com/softserveinc/ita/entity/QuestionInformation.java
	entity/src/main/java/com/softserveinc/ita/entity/QuestionsBlock.java
	entity/src/main/java/com/softserveinc/ita/entity/User.java
	http-request-service/src/main/java/com/softserveinc/ita/service/HttpRequestExecutor.java
	http-request-service/src/main/java/com/softserveinc/ita/service/impl/HttpRequestExecutorRestImpl.java
	interview-sheduller/pom.xml
	interview-sheduller/src/main/webapp/WEB-INF/web.xml
	interview-sheduller/src/test/java/com/softserveinc/ita/BaseMVCTest.java
	pom.xml
Final merge with develop
Fixed Entities for Security project and User-Manager
Merge branch 'fetaure/FixedEntitiesForSecurityAndUserManager' into feature/ApplicantsNotifications

Conflicts:
	entity/src/main/java/com/softserveinc/ita/entity/Applicant.java
	entity/src/main/java/com/softserveinc/ita/entity/Group.java
	entity/src/main/java/com/softserveinc/ita/entity/User.java
Resolved problems with group and dao
Change Http Rest Executor/ and Appointment Controller/ and Mok Interview  Http Executor
Merge remote-tracking branch 'origin/develop' into feature/ApplicantsNotifications

Conflicts:
	InterviewFactory/src/main/java/com/softserveinc/ita/interviewfactory/HttpRequestExecutorFactoryMock.java
	http-request-service/src/main/java/com/softserveinc/ita/service/impl/HttpRequestExecutorRestImpl.java
content repository allmoust done with fixes
Merge pull request #53 from combats/feature/ContentRepository

ready!