integrated Thomas changes
Merge branch 'master' of https://github.com/siliconchris1973/socialnetworkconnector

Conflicts:
	pom.xml
	src/main/java/de/comlineag/sbm/data/DataHelper.java
	src/main/java/de/comlineag/sbm/persistence/HANAPersistence.java