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

Conflicts:
	bin/classes/com/compitation/ticketsystem/Activity/WelcomeActivity.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