临时提交
Merge branch 'master' of https://github.com/ipetty/i-client

Conflicts:
	src/net/ipetty/android/ui/adapter/FeedAdapter.java