parandus
Merge branch 'master' of ssh://git@github.com/irhete/election.git

Conflicts:
	Valimised/war/javascript/candidateSearch.js
loader pilt