before changing Controller methods to use annotations instead of request.getParameter
Merge https://github.com/gediminasmorkys/HS

Conflicts:
	target/HS.war
	target/maven-archiver/pom.properties