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

Conflicts:
	res/layout/activity_login.xml