test
test committed changes from Jiefeng

test committed changes from Jiefeng
Merge remote-tracking branch 'upstream/master'
new text
Merge pull request #2 from MengQi2011/master

test merge
Merge pull request #1 from NaNyanNyan/master

aaa
Merge pull request #3 from MengQi2011/master

qww
Home screen development
clean up "test commit" files
Merge pull request #1 from yjfJeff/master

sync