test
Merge branch 'master' of https://github.com/rschumm/brain2.git

Conflicts:
	src/main/resources/H2/test.h2.db