New Course/Topic models now syntactically correct. Probably don't work yet.
Merge remote-tracking branch 'origin/dbchange' into dbchange