# HG changeset patch
# User www-data <www-data@sucuk.dcs.qmul.ac.uk>
# Date 1498476066 -3600
# Node ID 9675c2cf79b2f0373e0ce050b7e8fbe65cc63e0e
# Parent  68727eab8bb683c841c8be9371e8e0fdd6dd760c# Parent  47f187d4fc71dbfc4328674c3a3b56d4ed89353b
Merge branch 'master' of https://github.com/BrechtDeMan/WebAudioEvaluationTool

diff -r 68727eab8bb6 -r 9675c2cf79b2 js/core.js
--- a/js/core.js	Tue May 16 22:20:35 2017 +0100
+++ b/js/core.js	Mon Jun 26 12:21:06 2017 +0100
@@ -1198,9 +1198,9 @@
 
         // First extract those excluded from picking process
         var picked = [];
-        pool.forEach(function (e) {
+        pool.forEach(function (e, i) {
             if (e.alwaysInclude) {
-                picked.push(e);
+                picked.push(pool.splice(i, 1)[0]);
             }
         });
 
diff -r 68727eab8bb6 -r 9675c2cf79b2 python/score_parser.py
--- a/python/score_parser.py	Tue May 16 22:20:35 2017 +0100
+++ b/python/score_parser.py	Mon Jun 26 12:21:06 2017 +0100
@@ -85,7 +85,7 @@
                 audioElement = page.find("./audioelement/[@ref='"+ fragmentname+ "']") # Get the element
                 for value in audioElement.findall('./value'):
                     axisName = value.get('interface-name')
-                    if axisName == None:
+                    if axisName == None or axisName == "null":
                         axisName = 'default'
                     axisStore = storage[page_name]['axis'][axisName]
                     if hasattr(value, 'text'):