checkout conflict
Merge branch 'master' of https://github.com/martin329/Valimised-Uus.git

Conflicts:
	Valimised-Uus/src/com/valimised/SuggestKeywordServlet.java
otsing.js
Merge branch 'master' of https://github.com/martin329/Valimised-Uus.git
merge ja otsingud tööle