Eudat 311

Merge in JQuery uploader work to master.

Not sure how this pull request stuff works yet -  apologies for any mistakes.