MODIFIED: bug test activity
Merge branch 'master' of github.com:tinfoilhat/tinfoil-sms

Conflicts:
	branches/BugReporting/AndroidBugTest/.classpath
	branches/BugReporting/AndroidBugTest/AndroidManifest.xml
	branches/BugReporting/AndroidBugTest/res/values/strings.xml
	branches/BugReporting/AndroidBugTest/src/com/test/androidbugtest/AndroidBugTest.java
	branches/BugReporting/AndroidBugTest/src/com/test/androidbugtest/BugTestActivity.java