FsGenerator added
Generator update
MAGMA-250 deleteVariableBinaryValues fixed and entities cache updated after all variables have been deleted
Empty value set collection when all variables have been removed
MAGMA-251 Make sure tokens are not null in the sql query
Merge branch 'master' of https://github.com/obiba/magma
OPAL-2684 flat option added to  method
OPAL-2701 newValue and newSequence support ScriptableValue and ConsString
OPAL-2682 Make sure variables created from the data file have the same entity type as the reference table
Revert "Fixing javascript join impl, and adding setOf. Unit tests included", obiba fixed it differently

Obiba added the needed functionality, but differently, so remove this to fix the conflict.

This reverts commit a661cb30ff0aa9855d753b686fc111b45a3b9561.
Merge remote-tracking branch 'obiba/master'