Merge branch 'hotfix/coerce_unicode' into develop
start list of virtuoso pitfalls
Rewrite of CIF export. base_condition and discussion_condition now accept an alias_maker object. QMaps conditions are decomposed.
Gaby: ontology changes were again lost in commit 836acc791b95a1773e2c0f4660ee70a29fd4ca94. Please learn to merge without killing submodules.
residual reference to a dead file
Type should never be a NVARCHAR: migrate back to VARCHAR.
Also solves a CIF bug.
Merge branch 'develop' of https://github.com/ImaginationForPeople/assembl