fixed topic controller.
Merge branch 'master' of https://github.com/pbekker/justforteachers.co.za

Conflicts:
	JustForTeachersApi/JustForTeachersApi/Controllers/ResourceTopicController.cs
	justforteachers.co.za/DesktopModules/Blackhouse/Resources/ManageTopic.ascx.cs