fixing config
Merge branch '2.0-maint' of
https://joemoore13@github.com/AtomRain/neo4j-extensions.git into
2.0-maint

Conflicts:
	neo4j-extensions-spring/src/main/resources/META-INF/spring/springContext.xml