Conflict
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