定位和扫描没有实现
Merge branch 'master' of https://github.com/Dearest/TicketSystem.git

Conflicts:
	bin/classes/com/compitation/ticketsystem/Activity/ForgetPassword.class
	bin/classes/com/compitation/ticketsystem/Activity/MainPage.class
	bin/classes/com/compitation/ticketsystem/Activity/Register.class
	bin/classes/com/compitation/ticketsystem/Activity/UploadActivity.class
	src/com/compitation/ticketsystem/Activity/ForgetPassword.java
	src/com/compitation/ticketsystem/Activity/MainPage.java
解决冲突
Merge branch 'master' of https://github.com/Dearest/TicketSystem.git