Fooldal
Merge branch 'master' of https://github.com/bvamos/aprocom-server

Conflicts:
	src/main/java/com/aprohirdetes/server/templates/index.ftl.html