解决冲突
Merge branch 'master' of https://github.com/Dearest/TicketSystem.git
把联网的注释掉了
Merge branch 'master' of https://github.com/Dearest/TicketSystem.git

Conflicts:
	src/com/compitation/ticketsystem/Activity/LoginActivity.java
去掉线程池 去掉联网测试类
登录的后台逻辑测试通过
sharedpre 测试通过
解决更新的冲突
Merge branch 'master' of https://github.com/Dearest/TicketSystem.git

Conflicts:
	bin/AndroidManifest.xml
	bin/TicketSystem.apk
	bin/classes.dex
	bin/classes/com/compitation/ticketsystem/Activity/LoginActivity$1.class
	bin/classes/com/compitation/ticketsystem/Activity/LoginActivity$2.class
	bin/classes/com/compitation/ticketsystem/Activity/LoginActivity.class
	bin/classes/com/compitation/ticketsystem/Activity/Register$1.class
	bin/classes/com/compitation/ticketsystem/Activity/Register$2.class
	bin/classes/com/compitation/ticketsystem/Activity/Register.class
	bin/classes/com/compitation/ticketsystem/Idispatch/ILoginAndRegisterDispatch.class
	bin/classes/com/compitation/ticketsystem/R$id.class
	bin/classes/com/compitation/ticketsystem/R$layout.class
	bin/classes/com/compitation/ticketsystem/R$menu.class
	bin/classes/com/compitation/ticketsystem/R$string.class
	bin/classes/com/compitation/ticketsystem/R$style.class
	bin/classes/com/compitation/ticketsystem/dispatchImpl/LoginAndRegisterDispatchImpl.class
	bin/classes/com/comtipation/ticketsystem/model/User.class
	bin/resources.ap_
	gen/com/compitation/ticketsystem/R.java
	src/com/compitation/ticketsystem/dispatchImpl/LoginAndRegisterDispatchImpl.java