Sanity checks
Merge branch 'master' of github.com:M66B/XPrivacy

Conflicts:
	src/biz/bokhorst/xprivacy/PrivacyService.java