Fix both uploads in develop too...
Merge branch 'develop' of https://github.com/thexerteproject/xerteonlinetoolkits into develop
Merge remote-tracking branch 'remotes/origin/2.1' into develop
Get rid of dependency on ZipArchive
Pat's fixes for multiple LDAPs
Added note into bugfixes.txt re. issues log on GitHub
Removed setup folder from languages/en-GB
Merge pull request #42 from berthelemy/develop

Added note into bugfixes.txt re. issues log on GitHub & removed setup folder from languages/en-GB
updated image for nottingham templates workspace icon
Sound Optional Property for Question in Quiz
onbeforeunload="javascript:logout()" in an attempt to cure the 'session id not set bug'
Editor window is too small, so added an extra 20px so I don't have to keep resizing it
A utility function for opening a new window with additional information (from the need to show a transcript for narration if audio not present on end user's machine)

x_openInfoWindow(text)
A utility function for opening a new window with text: needed to show a transcript of narration for users with no audio.

x_openInfoWindow(htmlText)
Sorry messed up the last commit somehow. This has a utility function x_openInfoWindow for displaying additional text. I needed it to provide a transcript for narration for users without audio.
scrollbars=yes in x_openInfoWindow window.open params
fixed doctype
add_audio to quiz.xwd in src
Merge branch 'develop' of https://github.com/thexerteproject/xerteonlinetoolkits into develop
added <meta http-equiv="X-UA-Compatible" content="IE=edge"> to force IE to avoid compatibility mode as per the bootstrap docs