many item
vajalikkeasju
Merge remote-tracking branch 'origin/br'

Conflicts:
	src/evalimised/SearchServlet.java
	src/evalimised/StatisticsServlet.java
	src/evalimised/VoteData.java
	war/Evalimised.html
	war/Statistika.html
	war/WEB-INF/web.xml
	war/js/myTablesorter.js
	war/js/search.js
	war/js/sisu.js
	war/js/statistics.js