Opbased materialiser

this branch merges the materialiser_fix and the op_based crdts branches . I've applied a couple of fixes to the materialiser in this one. merging this branch to master is enough to include all the changes.