Merge branch 'master' of https://github.com/m---0/neo4sa

Conflicts:
	neo4sa.iml
	src/main/java/neo4sa/App.java
Merge branch 'master' of https://github.com/m---0/neo4sa

Conflicts:
	neo4sa.iml
	src/main/java/neo4sa/App.java