Merge branch 'develop' into automatic_scoring

diff --cc public/config.js.sample
Simple merge

diff --cc public/trivabble.js
index af7196bdaf4b9e506432220eb8a6fdfb3526ed87,2d75605da82cb1064672501def9aca5e366ea67f..a66696bf49a09ad38b921f1a9ef1b4034590f044
--- 1/public/trivabble.js
--- 2/public/trivabble.js
+++ b/public/trivabble.js
@@@ -59,7 -59,7 +59,8 @@@
      setConf("FLASH_LIGHT_DURATIONS", [800, 1600, 3200]);
      setConf("FLASH_LIGHT_DURATION",  middle("FLASH_LIGHT_DURATIONS"));
      setConf("FLASH_LIGHT_COLOR",     "#ee6633");
+     setConf("API_ENTRY_POINT",       Conf.APP_PATH + "/:trivabble");
 +    setConf("PREMIUM_SEVEN_TILES",   50);
  
      function getSetting(key) {
          let type;