refacoring, tests, backup Zwischenstand.
test
Merge branch 'master' of https://github.com/inren/inren-framework.git