Merge remote-tracking branch 'origin/benz' into usavich
筛选页面 改了年级，拼音也改了，及其他。。。
Merge branch 'master' into usavich

Conflicts:
	src/cn/edu/zju/isst/ui/contact/ContactFilterActivity.java
	src/cn/edu/zju/isst/ui/contact/ContactListFragment.java
	src/cn/edu/zju/isst/ui/contact/NoteBookadapter.java
add button of contactlistfragment
Merge branch 'benz' into usavich
majored -> major
修改contact 详情界面
同城校友
同城
城主完成
Merge remote-tracking branch 'origin/usavich' into benz

Conflicts:
	AndroidManifest.xml
	src/cn/edu/zju/isst/constant/Constants.java
	src/cn/edu/zju/isst/ui/contact/ContactDetailActivity.java