logimise  headeri osa
..
Merge branch 'master' of ssh://git@github.com/irhete/election.git

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