Changed the refactoring issiues from the pull request
Merge branch 'refactoring' of https://github.com/celements/celements-core.git into refactoring