correction
Merge branch 'master' of https://github.com/BTS-SIO2-2013/TicketScan

Conflicts:
	src/esarc/bts/ticketscan/model/event/Event.java