xeb context
web context
Logger message
Web service
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/compiler.xml
	ServiceTest/ServiceTest.iml
	ServiceTest/src/main/java/Test/Main.java
	ServiceTest/src/main/java/controller/MainServlet.java
	ServiceTest/src/main/java/service/TestService.java
	ServiceTest/src/main/java/spring/ServletContext.java
	ServiceTest/src/main/resources/log4j.properties