content.php appears, edit button for view.php lets you edit and editTopic.php works
Merge remote-tracking branch 'origin/master'