Adding a merge function which can be called when fetching corpora
added expect objects to be equal in a colection
jshint
adding merge for collections
adding validation that the json member is not undefined
switching back to the Crypto-js which worked in Backbone app for #1601 but the same error appears in Montage,
speaker extends UserMask, so name will work too
Adding database methods get set and delete from oprime

from https://github.com/ProjetDeRechercheSurLecriture/oprime-montage/commit/2bd50051ab51b7db9b84004aeb90485f038742ee
montage require is parsing even commented out require statments
using contain for warnings
distinguish between returned object and the first object

so we can merge two objects into a third without affecting the originals, also adding a confirm method on objects so that programmers can override the method dependign on their userinterfaces technologies. for #124 #110 #818 #793
distinguish between returned collection  and the first collection

not adding to collections if it already exits (collections are now uniqued automatically if you use the add or set methods)
so we can merge two collections into a third without affecting the originals, also adding a confirm method on collections in case they contain non-fielddb objects that will be overwritten/unmerged. ththe confirm method can also be overriden dependingn on userinterfaces technologies. for #124 #110 #818 #793
adding tests for merge of corpora for  #963 #728
diff of CORS in oprime-montage
Revert "diff of CORS in oprime-montage"

This reverts commit b70bf09deafa67c65c7c289a8406eab9de026e1a.
merging in changes from CORS in oprime-montage to do CORS on images
Merge pull request #1602 from cesine/master

Psycholinguistics Dashboard iteration 5 - Connect games with dashboard