Updates with button and label references
Merge remote-tracking branch 'origin/master'

Conflicts:
	Sandbox/src/com/privacy/sandbox/MainActivity.java