Minor changes for docblocks
Merge branch 'develop' of github.com:impresspages/ImpressPages-CMS into develop
Refactoring
Merge branch 'develop' of github.com:impresspages/ImpressPages-CMS into develop
Merge branch 'develop' of github.com:impresspages/ImpressPages-CMS into develop
Return of ColorPicker
Merge branch 'develop' of github.com:impresspages/ImpressPages-CMS into develop
Added ipEmailTemplate draft docblock. Fixed paths for Windows.
Added docblocks for Page class
refactor password reset controller