fix ob_end_clean error
Merge branch '2.2/develop' of https://github.com/james2doyle/pyrocms into 2.2/develop
Add ogv and webm to supported mimes and file types. Closes #3317 and
revert pages admin
Merge pull request #3342 from james2doyle/2.2/new-mimes

2.2/new mimes