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

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