experimente
release 1.5
Merge branch 'master' of https://github.com/inren/inren-framework

Conflicts:
	pom.xml