1.6.4 build issue was fixed.
Merge branch '1.7-RC1'

Conflicts:

server/src/main/java/com/orientechnologies/orient/server/schedule/OSched
uleHandler.java
Make blueprints-test a test scope dependency

Test dependencies like blueprints-test should be in test scope.
Merge pull request #2069 from sslavic/patch-1

Make blueprints-test a test scope dependency
Declare orientdb-core dependency to be of jar type

orientdb-core pom dependency is of no use here, it's not even a BOM pom. It is not only not-useful, but it is casusing issues. E.g. with SBT, even if I explicitly added orientdb-core dependency, the pom type of orientdb-core dependency in orientdb-graph pom was removing orientdb-core from the classpath, so in my code any class referencing a class which makes use of orientdb-core classes would not compile (was getting infamous "class file is broken error").

Thus, instead of pom type, orientdb-core dependency should be declared as dependency of jar type (default).
Merge pull request #2070 from sslavic/patch-2

Declare orientdb-core dependency to be of jar type
Merge branch 'develop'
Update README.md
Merge pull request #2171 from glenselle/patch-1

Update README.md
Add Rexster configuration file.

Rexster no longer depends on OrientDB, therefore this class needs to live with the OrientDB repository.  The addition of rexster-core to the pom comes with provided scope as OrientDB does not need to package rexster dependencies (they are provided by rexster when OrientDB is deployed there).
Include additional javadoc.
Correction in javadoc example configuration.
Merge remote-tracking branch 'origin/master' into develop