hääletamine+kandideerimine edit
Merge branch 'master' of https://github.com/martin329/Valimised-Uus.git

Conflicts:
	Valimised-Uus/war/WEB-INF/web.xml