locale browse
params in deployment
Merge origin/master

Conflicts:
	client/src/main/resources/k5client.properties
	client/src/main/resources/k5client_cs.properties
	search/build.gradle