Merge branch 'develop' into rid-set-sbtree

Conflicts:
	graphdb/src/main/java/com/tinkerpop/blueprints/impls/orient/OrientEdge.java
	graphdb/src/main/java/com/tinkerpop/blueprints/impls/orient/OrientVertex.java