7
Merge remote-tracking branch 'origin/master'

Conflicts:
	GitDemo/src/com/example/gitdemo/MainActivity.java