merging with maid's changes
Merge branch 'master' of https://github.com/siliconchris1973/socialnetworkconnector

Conflicts:
	.gitignore
	src/main/java/de/comlineag/sbm/persistence/Neo4JPersistence.java