Lisasin tekstiversiooni tulemustest
Merge branch 'master' of ssh://git@github.com/irhete/election.git

Conflicts:
	Valimised/src/com/valimised/client/Menu.java
Merge branch 'master' of ssh://git@github.com/irhete/election.git

Conflicts:
	Valimised/war/Valimised.css