1.22
Merge branch 'master' of github.com:Alife/Android-163News

Conflicts:
	src/com/and/netease/TabNewsActivity.java