fixed a column ID problem
Merge branch 'master' into preview
update preview on reference/referenceable changes
fixed encoding problems
better fix
Merge branch 'preview'