Ajout dossier script
Modification employe
Merge branch 'master' of https://github.com/BTS-SIO2-2013/BilletMaster

Conflicts:
	js/employe.js
	modules/employe/cuEmploye.php
	scripts.php