# HG changeset patch
# User Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
# Date 1498474793 -3600
# Node ID 632ccfeab95a1696136238a4359d2b4d38c0cee6
# Parent  2706f3dd82e6444be6d88ebbfb43894abab9fd4c# Parent  033027759cf775749c26c43844aa702dfb0ba46b
Merge branch 'vnext' into Dev_main

diff -r 2706f3dd82e6 -r 632ccfeab95a docs/Instructions/img/interface-AB.png
Binary file docs/Instructions/img/interface-AB.png has changed
diff -r 2706f3dd82e6 -r 632ccfeab95a docs/Instructions/img/interface-ABC.png
Binary file docs/Instructions/img/interface-ABC.png has changed
diff -r 2706f3dd82e6 -r 632ccfeab95a docs/Instructions/img/interface-ABX.png
Binary file docs/Instructions/img/interface-ABX.png has changed
diff -r 2706f3dd82e6 -r 632ccfeab95a docs/Instructions/img/interface-MUSHRA.png
Binary file docs/Instructions/img/interface-MUSHRA.png has changed
diff -r 2706f3dd82e6 -r 632ccfeab95a docs/Instructions/img/interface-ape.png
Binary file docs/Instructions/img/interface-ape.png has changed
diff -r 2706f3dd82e6 -r 632ccfeab95a docs/Instructions/img/interface-discrete.png
Binary file docs/Instructions/img/interface-discrete.png has changed
diff -r 2706f3dd82e6 -r 632ccfeab95a docs/Instructions/img/interface-horizontal.png
Binary file docs/Instructions/img/interface-horizontal.png has changed
diff -r 2706f3dd82e6 -r 632ccfeab95a docs/Instructions/img/interface-timeline.png
Binary file docs/Instructions/img/interface-timeline.png has changed
diff -r 2706f3dd82e6 -r 632ccfeab95a js/core.js
--- a/js/core.js	Mon Jun 26 11:23:59 2017 +0100
+++ b/js/core.js	Mon Jun 26 11:59:53 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 2706f3dd82e6 -r 632ccfeab95a python/score_parser.py
--- a/python/score_parser.py	Mon Jun 26 11:23:59 2017 +0100
+++ b/python/score_parser.py	Mon Jun 26 11:59:53 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'):