Modified Object controller to avoid hierarchical objects in properties
Merge remote-tracking branch 'origin/neo4j' into masterNeoMerge