Merge branch 'master' of https://github.com/Dearest/TicketSystem.git

Conflicts:
	bin/classes/com/compitation/ticketsystem/Activity/ForgetAndRegister.class
	src/com/compitation/ticketsystem/Activity/MainPage.java
Merge branch 'master' of https://github.com/Dearest/TicketSystem.git
Merge branch 'master' of https://github.com/Dearest/TicketSystem.git
xml与图片