first modifications
Merge branch 'master' into issue_395
better handling of well-formed JSON strings but that are not serializable into OrientDB