Formatting
Merge branch 'master' into import

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