Merge branch 'master' of https://github.com/Themis-J/Themis-Service

Conflicts:
	src/main/java/META-INF/context.xml
	src/main/java/META-INF/database-config.xml
	src/main/resources/META-INF/context.xml
	src/main/resources/META-INF/database-config.xml
	src/main/resources/context.xml
	src/main/resources/database-config.xml
solved confilicts