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

Conflicts:
	class/Evenement.class.php
Merge tout
Merge branch 'master' of https://github.com/BTS-SIO2-2013/BilletMaster

Conflicts:
	eventjson.php
	modules/stat/statTicket.php
	modules/stat/statTicketSalle.php