phpdoc comments
Merge branch 'temp' into 3.2
Merge branch '3.2' of github.com:impresspages/ImpressPages-CMS into 3.2