updates from svn
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml
	src/main/java/com/github/golubevda/webapptemplate/config/ServicesConfig.java
	src/main/java/com/github/golubevda/webapptemplate/config/WebConfig.java
	src/main/java/com/github/golubevda/webapptemplate/controller/ResourceController.java
	src/main/java/com/github/golubevda/webapptemplate/util/ServletUtils.java
	src/test/java/com/github/golubevda/webapptemplate/AbstractIntegrationTest.java
merging with master
artifacts versions were bumped