Login界面修改
Merge branch 'master' of https://github.com/Dearest/TicketSystem.git

Conflicts:
	bin/classes/com/compitation/ticketsystem/Activity/LoginActivity$1.class
	bin/classes/com/compitation/ticketsystem/R$attr.class
	bin/classes/com/compitation/ticketsystem/R$dimen.class
	bin/classes/com/compitation/ticketsystem/R$drawable.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
	gen/com/compitation/ticketsystem/R.java
	src/com/compitation/ticketsystem/dispatchImpl/LoginAndRegisterDispatchImpl.java