Merge branch 'master' into develop
Fixes the bug that caused the question set input to remain disabled upon restart.
Merge branch 'develop' into gh-pages