update tk's file
image updated
Merge branch 'master' of github.com:RuiqingQiu/CSSA

Conflicts:
	res/layout/activity_main.xml
	src/com/cssa/app/DAO.java
	src/com/cssa/app/MainActivity.java
	src/com/cssa/app/qiu_rui_qing/ActivityList.java
	src/com/cssa/app/qiu_rui_qing/qiu_rui_qing.java
	src/com/cssa/app/tao_kang/tao_kang.java