Fixed function restrictions not sticking
Merge branch 'master' of github.com:M66B/XPrivacy

Conflicts:
	src/biz/bokhorst/xprivacy/ActivityApp.java
	src/biz/bokhorst/xprivacy/RState.java