tesrt
Merge remote-tracking branch 'origin/master'

Conflicts:
	myapp/src/com/example/myapp/MyActivity.java