Merge pull request #1450 from Spuds/sp

Integration bugs
! Many files, start of @package grouping
! tweak spacing so apigen picks up items as bullet lists

Signed-off-by: Spuds <spuds@spudsdesign.com>
Merge pull request #1454 from Spuds/whatsupdoc

Start of @package grouping for docs
! Syntax error ;)
Signed-off-by:Thorsten Eurich <thorsten@eurich.de>
Merge pull request #1455 from eurich/upgradefix

! Syntax error in Upgrade.php
! re-arrange the integration hook location

Signed-off-by: Spuds <spuds@spudsdesign.com>
! fix the integration placement issues in the admin controllers

Signed-off-by: Spuds <spuds@spudsdesign.com>
! and those "other" controllers as well, just to make things common
! could add integration hooks as well ;)

Signed-off-by: Spuds <spuds@spudsdesign.com>