For new DB settings.
Merge branch 'master' of https://github.com/Themis-J/Themis-Service

Conflicts:
	src/main/filters/configuration/dev/tokens.properties