ff
Merge branch 'master' of https://github.com/Ben4485/nachrichter.git

Conflicts:
	appcompat_v7/bin/android-support-v7-appcompat.jar
	nachrichter/bin/jarlist.cache