refactored due to split off server component
Merge branch 'master' of https://github.com/techdivision/TechDivision_Runtime
Merge pull request #179 from zelgerj/master

refactored due to split off server component