minor refactoring
Merge branch 'master' of https://github.com/techdivision/TechDivision_ApplicationServerWebsite
bugfix: inheritance of wrong parent class
Merge pull request #25 from wick-ed/master

diff reviewed end tested locally