some changes don't remember
I don't know exactly what I've done using vimdiff

Merge branch 'master' of https://github.com/xeppaka/lentaru

Conflicts:
	src/org/gepa/LentaruServlet.java