MOD
Merge branch 'master' of github.com:HelloMars/KuangNeiAndroid

Conflicts:
	kuangneipro/res/layout/activity_post_list.xml
	kuangneipro/src/me/kuangneipro/activity/PostListActivity.java