Merge branch 'master' of https://github.com/cr44d/loternik

Conflicts:
	src/main/webapp/form.jsp
Merge branch 'master' of https://github.com/cr44d/loternik