Merge branch 'master' of https://github.com/OhadR/SecuredDictionary

Conflicts:
	src/main/resources/client.properties