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

Conflicts:
	WebContent/static/html/jsFile.js
	WebContent/static/html/print.css
Merge branch 'master' of https://github.com/martin329/Valimised.git
menüü javascripti/AJAXiga poolik
Merge branch 'master' of https://github.com/martin329/Valimised.git