commiting to try to merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	Sandbox/bin/classes/com/privacy/sandbox/MainActivity.class
	Sandbox/bin/classes/com/privacy/sandbox/R$id.class
	Sandbox/bin/classes/com/privacy/sandbox/R$layout.class
	Sandbox/bin/classes/com/privacy/sandbox/R$menu.class
	Sandbox/bin/classes/com/privacy/sandbox/R$string.class
	Sandbox/bin/classes/com/privacy/sandbox/R$style.class
	Sandbox/gen/com/privacy/sandbox/R.java
	SandboxedApp/bin/classes/com/privacy/sandboxedapp/R$id.class
	SandboxedApp/bin/classes/com/privacy/sandboxedapp/R$layout.class
	SandboxedApp/bin/classes/com/privacy/sandboxedapp/R$menu.class
	SandboxedApp/bin/classes/com/privacy/sandboxedapp/R$string.class
	SandboxedApp/bin/classes/com/privacy/sandboxedapp/R$style.class
	SandboxedApp/bin/classes/com/privacy/sandboxedapp/SandboxedMainActivity.class
	SandboxedApp/gen/com/privacy/sandboxedapp/R.java