Some general progress on getting topics working.
Getting CKEditor going, and some other general changes.
General progress.
General progress.
Removed test file.
Merge origin/master