Fixed type in linux build script
Merge pull request #4 from thexerteproject/master

Merge changes to master back into develop
Ignore locally created database.php file and USER-FILES/ and import/ folder contents (modified locally) so that they don't end up in repository

Signed-off-by: JohnSmith-LT <J.J.Smith@gcu.ac.uk>
Wrap MathJax Queue calls to catch error when LO running offline - MathJax wont work offline...

Signed-off-by: JohnSmith-LT <J.J.Smith@gcu.ac.uk>
Tidyup changes to glossary that were somehow missed...

Signed-off-by: JohnSmith-LT <J.J.Smith@gcu.ac.uk>
Move MoovRelocator to centralised /library
Patch both upload.php files to use the new centralised MoovRelocator library
Add readme.txt and media folder to 'sit' template so that media upload is possible
Merge branch 'feature/centralise_MoovRelocator' into develop
Get the FoUC off
Add the initial files and patch the existing ones...
Fix for wrong text size in textDrawing model - Bug #11

Signed-off-by: JohnSmith-LT <J.J.Smith@gcu.ac.uk>
Fix whitespace
Patch save.php to attempt to address Issue #13
Feed back on upload media

Implemented a variant of John Smith's solution to give better feedback on upload of media from the wizard
 Messages are retrived from the language file
Fixed issue #15

Committed proposed fix by Tom Knight
Fix for Flickr difference between Flash/HTML5 engines, Issue #16
Fix to allow Flickr to choose correct image size on first load (on first load always chose max size before)
Small code change to address issue #19 (images in Glossary). You can now enter the string

FileLocation + 'filename'

In the glossary definition in the same format as an image that has been added to a media page...
Wrap MathJax Queue calls to catch error when LO running offline

MathJax won't work offline
- See John Smiths fix on xenith.js, propagate this to
  site/common/js/application.js and the quiz model of the xerte Nottingham
  template.