add some code in r2 branch may conflict
add two line code in master branch,means bug fix
Merge branch 'master' into r2_studybranch
make a conflict in r2_study
make a conflict in master
Merge branch 'master' into r2_studybranch

Conflicts:
	SnailTwo/src/sun/earth/ca/snail/two/HomeActivity.java

	conflict resolve