Remove obsolete permission, rename XPrivacy back to prevent problems
Merge branch 'master' of https://github.com/M66B/XPrivacy

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