# HG changeset patch
# User Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk>
# Date 1492182397 -3600
# Node ID 23f84278dc2a7a60c685d0ff7941e5c371f81291
# Parent  eece6007daa5ec8397a4392f5f4de620e0c7c9d2# Parent  52224b9d6e8bd6b18bd5f8ce75a55ff7c81da6fd
Merge branch 'vnext' into Dev_main

# Conflicts:
#	js/core.js

diff -r eece6007daa5 -r 23f84278dc2a js/specification.js
--- a/js/specification.js	Fri Mar 31 10:47:27 2017 +0100
+++ b/js/specification.js	Fri Apr 14 16:06:37 2017 +0100
@@ -527,6 +527,7 @@
         this.interfaces = [];
         this.playOne = undefined;
         this.restrictMovement = undefined;
+        this.position = undefined;
         this.commentBoxPrefix = "Comment on track";
         this.audioElements = [];
         this.commentQuestions = [];
diff -r eece6007daa5 -r 23f84278dc2a xml/test-schema.xsd
--- a/xml/test-schema.xsd	Fri Mar 31 10:47:27 2017 +0100
+++ b/xml/test-schema.xsd	Fri Apr 14 16:06:37 2017 +0100
@@ -100,6 +100,7 @@
                 <xs:attribute name="labelStart" type="xs:string" use="optional" default="" />
                 <xs:attribute ref="poolSize" />
                 <xs:attribute ref="alwaysInclude" />
+                <xs:attribute name="position" use="optional" type="xs:nonNegativeInteger" />
                 <xs:attribute ref="preSilence" />
                 <xs:attribute ref="postSilence" />
                 <xs:attribute ref="playOne" />