Fixed some stuff
Merge branch 'master' of https://github.com/sander92/evalimine

Conflicts:
	src/evalimised/EvalimisedServlet.java
	war/search.js