# HG changeset patch
# User Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
# Date 1474456601 -3600
# Node ID 5ddfab2c92e43857762e67edd50dba75b8c2f0c9
# Parent  23c3909023785632b570b7942042f8ba5c80a036# Parent  6655d528923ad878468240b021b82ed03c95ad87
Merge branch 'master' into hot_fix

diff -r 23c390902378 -r 5ddfab2c92e4 tests/examples/ABX_example.xml
--- a/tests/examples/ABX_example.xml	Wed Sep 21 09:55:07 2016 +0100
+++ b/tests/examples/ABX_example.xml	Wed Sep 21 12:16:41 2016 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <waet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="test-schema.xsd">
-	<setup interface="ABX" projectReturn="save.php" randomiseOrder='true' poolSize="2" loudness="-23" sampleRate="44100">
+	<setup interface="ABX" projectReturn="save.php" randomiseOrder='true' poolSize="2" loudness="-23">
 		<survey location="before">
 			<surveyentry type="question" id="sessionId" mandatory="true">
 				<statement>Please enter your name.</statement>
diff -r 23c390902378 -r 5ddfab2c92e4 tests/examples/AB_example.xml
--- a/tests/examples/AB_example.xml	Wed Sep 21 09:55:07 2016 +0100
+++ b/tests/examples/AB_example.xml	Wed Sep 21 12:16:41 2016 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <waet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="test-schema.xsd">
-	<setup interface="AB" projectReturn="save.php" randomiseOrder='true' poolSize="2" loudness="-23" sampleRate="44100" playOne="true">
+	<setup interface="AB" projectReturn="save.php" randomiseOrder='true' poolSize="2" loudness="-23" playOne="true">
 		<survey location="before">
 			<surveyentry type="question" id="sessionId" mandatory="true">
 				<statement>Please enter your name.</statement>
diff -r 23c390902378 -r 5ddfab2c92e4 tests/examples/mushra_example.xml
--- a/tests/examples/mushra_example.xml	Wed Sep 21 09:55:07 2016 +0100
+++ b/tests/examples/mushra_example.xml	Wed Sep 21 12:16:41 2016 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <waet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="test-schema.xsd">
-	<setup interface="MUSHRA" projectReturn="save.php" randomiseOrder='true' poolSize="2" loudness="-23" sampleRate="44100">
+	<setup interface="MUSHRA" projectReturn="save.php" randomiseOrder='true' poolSize="2" loudness="-23">
         <exitText>Thank you for looking at WAET. You can modify the successful completion text as well!</exitText>
 		<survey location="before">
 			<surveyentry type="question" id="sessionId" mandatory="true">