Refactoring
Merge branch 'develop' of github.com:impresspages/ImpressPages into develop