Merge pull request #22 from wick-ed/master

reviewed diff and reviewed locally
Merge branch 'master' of https://github.com/techdivision/TechDivision_ApplicationServerWebsite
bugfix: inheritance of wrong parent class