Rebase onto Coursemology dev branch

Rebase scribing questions branch onto tip of dev branch with weiqing's Guilds feature