Merged.
Merge branch 'master' of https://github.com/luksrn/javarch
Merge branch 'master' of https://github.com/luksrn/javarch
WIP developing improvements to support multi tenancy