Merge branch 'master' into multichoice

Conflicts:
	src/biz/bokhorst/xprivacy/ActivityMain.java
	src/biz/bokhorst/xprivacy/ActivityShare.java