Merge branch 'develop' of github.com:orientechnologies/orientdb into 'develop' of github.com:thewall13/orientdb