henhao
add message
henhao add
Merge branch 'henhao' into xiaofeng

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