new file:   AdvancedTest/.project
new file:   AdvancedTest/pom.xml
new file:   AdvancedTest/src/main/java/com/epam/service/LoginService.java
new file:   AdvancedTest/src/main/java/com/epam/service/exceptions/InvalidCredentialsException.java
new file:   AdvancedTest/src/main/resources/log4j.xml
new file:   AdvancedTest/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml
new file:   AdvancedTest/src/main/webapp/WEB-INF/spring/root-context.xml
new file:   AdvancedTest/src/main/webapp/WEB-INF/views/home.jsp
new file:   AdvancedTest/src/main/webapp/WEB-INF/web.xml
new file:   AdvancedTest/src/test/resources/log4j.xml
	new file:   SpringMVC/.project
	new file:   SpringMVC/pom.xml
	new file:   SpringMVC/src/main/java/com/mkyong/common/bean/Client.java
	new file:   SpringMVC/src/main/java/com/mkyong/common/bean/Grant.java
	new file:   SpringMVC/src/main/java/com/mkyong/common/bean/Questionnaire.java
	new file:   SpringMVC/src/main/java/com/mkyong/common/controller/AboutController.java
	new file:   SpringMVC/src/main/java/com/mkyong/common/controller/ClientController.java
	new file:   SpringMVC/src/main/java/com/mkyong/common/controller/LoginController.java
	new file:   SpringMVC/src/main/java/com/mkyong/common/controller/OwnInterceptor.java
	new file:   SpringMVC/src/main/java/com/mkyong/common/controller/QuestionnaireController.java
	new file:   SpringMVC/src/main/java/com/mkyong/common/controller/WelcomeController.java
	new file:   SpringMVC/src/main/java/com/mkyong/common/service/GrantService.java
	new file:   SpringMVC/src/main/java/com/mkyong/common/util/ClientBindingInitializer.java
	new file:   SpringMVC/src/main/resources/messages.properties
	new file:   SpringMVC/src/main/resources/messages_en_US.properties
	new file:   SpringMVC/src/main/resources/messages_ru_RU.properties
	new file:   SpringMVC/src/main/webapp/WEB-INF/datasource.xml
	new file:   SpringMVC/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml
	new file:   SpringMVC/src/main/webapp/WEB-INF/pages/about.jsp
	new file:   SpringMVC/src/main/webapp/WEB-INF/pages/addClient.jsp
	new file:   SpringMVC/src/main/webapp/WEB-INF/pages/error.jsp
	new file:   SpringMVC/src/main/webapp/WEB-INF/pages/firstPartQuestionnaire.jsp
	new file:   SpringMVC/src/main/webapp/WEB-INF/pages/hello.jsp
	new file:   SpringMVC/src/main/webapp/WEB-INF/pages/login.jsp
	new file:   SpringMVC/src/main/webapp/WEB-INF/pages/secondPartQuestionnaire.jsp
	new file:   SpringMVC/src/main/webapp/WEB-INF/pages/showClients.jsp
	new file:   SpringMVC/src/main/webapp/WEB-INF/pages/thirdPartQuestionnaire.jsp
	new file:   SpringMVC/src/main/webapp/WEB-INF/spring-security.xml
	new file:   SpringMVC/src/main/webapp/WEB-INF/web.xml
	new file:   SpringMVC/src/main/webapp/index.jsp
Merge branch 'master' of https://github.com/activecs/education

Conflicts:
	SpringMVC/src/main/java/com/mkyong/common/bean/Client.java
	SpringMVC/src/main/java/com/mkyong/common/bean/Grant.java
	SpringMVC/src/main/java/com/mkyong/common/bean/Questionnaire.java
	SpringMVC/src/main/java/com/mkyong/common/controller/AboutController.java
	SpringMVC/src/main/java/com/mkyong/common/controller/ClientController.java
	SpringMVC/src/main/java/com/mkyong/common/controller/LoginController.java
	SpringMVC/src/main/java/com/mkyong/common/controller/OwnInterceptor.java
	SpringMVC/src/main/java/com/mkyong/common/controller/QuestionnaireController.java
	SpringMVC/src/main/java/com/mkyong/common/controller/WelcomeController.java
	SpringMVC/src/main/java/com/mkyong/common/service/GrantService.java
	SpringMVC/src/main/java/com/mkyong/common/util/ClientBindingInitializer.java
	SpringMVC/src/main/resources/messages.properties
	SpringMVC/src/main/resources/messages_en_US.properties
	SpringMVC/src/main/resources/messages_ru_RU.properties
	SpringMVC/src/main/webapp/WEB-INF/datasource.xml
	SpringMVC/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml
	SpringMVC/src/main/webapp/WEB-INF/pages/about.jsp
	SpringMVC/src/main/webapp/WEB-INF/pages/addClient.jsp
	SpringMVC/src/main/webapp/WEB-INF/pages/error.jsp
	SpringMVC/src/main/webapp/WEB-INF/pages/firstPartQuestionnaire.jsp
	SpringMVC/src/main/webapp/WEB-INF/pages/hello.jsp
	SpringMVC/src/main/webapp/WEB-INF/pages/login.jsp
	SpringMVC/src/main/webapp/WEB-INF/pages/secondPartQuestionnaire.jsp
	SpringMVC/src/main/webapp/WEB-INF/pages/showClients.jsp
	SpringMVC/src/main/webapp/WEB-INF/pages/thirdPartQuestionnaire.jsp
	SpringMVC/src/main/webapp/WEB-INF/spring-security.xml