teaching survey: new rules for credit_factor, teaching_factor
mods to implement simplified db structure (wip)
Merge commit 'github/testing' into beta