test from mdm workspace
test from mdm workspace 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	TestGitHub/src/com/example/testgithub/MainActivity.java