添加headerview
Merge branch 'master' of https://github.com/YangMann/ChiChiApp_Android

Conflicts:
	ChiChi/src/edu/SJTU/ChiChi/utils/CardAdapter.java