init pois
Merge branch 'master' of github.com:Corvidian/tenttiarkisto
Merge branch 'master' of github.com:Corvidian/tenttiarkisto

Conflicts:
	src/main/java/tenttiarkisto/controllers/DefaultController.java