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
修改major接口
majored -> major
修改contact 详情界面
同城校友
新增修改个人信息界面
同城
修改个人信息
Merge remote-tracking branch 'origin/phoenix' into benz

Conflicts:
	AndroidManifest.xml
	src/cn/edu/zju/isst/ui/main/SlidingMenuExpListAdapter.java
城主完成
增加全局數據轉換類
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
Add UpdateManager. Still buggy for auto open downloaded apk file.
Merge remote-tracking branch 'origin/benz' into phoenix

更新版本
修改服务器地址