merging conflicts

git-svn-id: https://plugins.svn.wordpress.org/slickquiz/trunk@788413 b8457f37-d9ea-0310-8a92-e5e31aec5664
bug fix: start button wasn't getting enabled due to an order of operations issue

git-svn-id: https://plugins.svn.wordpress.org/slickquiz/trunk@789432 b8457f37-d9ea-0310-8a92-e5e31aec5664