Eclipse部署完成

重新部署了eclipse，现在已经可以使用。
服务器配置完成
Merge branch 'mergeTest' of https://github.com/linyxy/Civitas_code into mergeTest

Conflicts:
	bin/Civitas.apk
	bin/classes.dex
	bin/classes/linyxy/civitas/FullscreenActivity$loginButtonListener.class
	bin/classes/linyxy/civitas/FullscreenActivity.class
	bin/classes/linyxy/civitas/util/DataRequestUtil.class
	bin/classes/linyxy/civitas/util/HttpUtil.class
	bin/classes/linyxy/civitas/util/UpdateData.class
	bin/classes/projectTesting/HttpUtilX.class
	bin/resources.ap_