kandidaadi test
Merge branch 'master' of https://github.com/sander92/evalimine

Conflicts:
	.classpath
	war/WEB-INF/appengine-web.xml
	war/js/search.js