[BUGFIX] Load content area content
Merge pull request #604 from hmspl/editContent

[BUGFIX] Load content area content
[TASK] Update compatibility for phpunit v4
Merge pull request #608 from xf-/phpunit4

[TASK] Update compatibility for phpunit v4