segadus
Merge branch 'master' of https://github.com/martin329/Valimised.git

Conflicts:
	WebContent/static/html/fblogin.html
	WebContent/static/html/haalt.html
	WebContent/static/html/index.html
	WebContent/static/html/kandidaadiksLisamine.html
Merge branch 'master' of https://github.com/martin329/Valimised.git

Conflicts:
	WebContent/static/html/fblogin.html
	WebContent/static/html/haalt.html
	WebContent/static/html/index.html
Merge branch 'master' of https://github.com/martin329/Valimised.git

Conflicts:
	WebContent/static/html/css.css
	WebContent/static/html/index.html
	WebContent/static/html/tuvastamata.html
	WebContent/static/html/tuvastamataKandidaat.html
	WebContent/static/html/tuvastatud.html
	WebContent/static/html/tuvastatudKandidaat.html
Merge branch 'master' of https://github.com/martin329/Valimised.git

Conflicts:
	WebContent/static/html/css.css
	WebContent/static/html/haaletamine.html
	WebContent/static/html/haaletamiseTagasiside.html
	WebContent/static/html/kandidaadiksLisamine.html
	WebContent/static/html/lisamiseTagasiside.html
Merge branch 'master' of https://github.com/martin329/Valimised.git

Conflicts:
	WebContent/static/html/css.css
	WebContent/static/html/fblogin.html
	WebContent/static/html/printvaadeErakond.html
	WebContent/static/html/printvaadeKandidaat.html
	WebContent/static/html/tuvastamata.html
	WebContent/static/html/tuvastamataKandidaat.html
	WebContent/static/html/tuvastatud.html
	WebContent/static/html/tuvastatudKandidaat.html