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

Conflicts:
	Valimised-Uus/.classpath
	Valimised-Uus/.settings/com.google.gdt.eclipse.core.prefs
	Valimised-Uus/.settings/org.eclipse.jdt.core.prefs
	Valimised-Uus/src/com/valimised/Valimised_UusServlet.java