Train
新分支
T2
Master
T22
Merge branch 't2'

Conflicts:
	Training/src/com/hinyon/t1/MainActivity.java
Merge branch 'T3'
MasterT4
Merge branch 'master' into T4

Conflicts:
	Training/src/com/hinyon/t1/MainActivity.java