1
Merge branch 'master' of https://github.com/timurt/stub-application

Conflicts:
	stub-app/src/main/java/kz/beesoft/servlet/SoapControllerServlet.java