Merge pull request #224 from tomfuller2/master

Fixed reference in elements.php to the media.class file instead of an old internal mediatable
Merge pull request #226 from tomfuller2/master

Fixing the teacher study list header
Had to revert admin side. Fixed reference to a field (topics_id) that is no longer in the db.