Revert "Remplacement nom evenement par libelle"

This reverts commit 1b7c891d40b3ef2cb75317e183f1509e17299fd4.
Merge branch 'master' of https://github.com/BTS-SIO2-2013/TicketScan

Conflicts:
	src/esarc/bts/ticketscan/logActivity.java
	src/esarc/bts/ticketscan/model/event/Event.java
	src/esarc/bts/ticketscan/model/salle/Salle.java
Corrections