test
Merge branch 'master' of https://github.com/gundermann/comphel.git

Conflicts:
	kata_points/gen/com/comphel/katapoints/R.java
kata points doesn't need database