fixed git merge failure
Merge branch 'master' of https://github.com/siliconchris1973/socialnetworkconnector

Conflicts:
	src/main/java/de/comlineag/sbm/handler/TwitterParser.java