“pull前需commit”
Merge branch 'verify/database' of github.com:ZJU-ISST/isst-android into verify/database

Conflicts:
	src/cn/edu/zju/isst/v2/city/CityTest.java
最后修正的结果