päringukasti fix
commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	Valimised-Uus/war/html/lisamiseTagasisideError.html
	Valimised-Uus/war/js/jsFile.js