bug fixed
Merge branch 'master' of github.com:chris6k/tiyuzazhi

Conflicts:
	src/com/tiyuzazhi/api/ArticleApi.java
	src/com/tiyuzazhi/app/ExamineDetailActivity.java