orthographe 1
orthographe 1
Merge origin/master

Conflicts:
	nbproject/configs/web2.properties
	nbproject/project.properties
	nbproject/project.xml
	src/Fonctions.php
	src/audiance_form.php
	src/audiances.php
	src/auth.php
	src/connect.php
	src/css/_notes/dwsync.xml
	src/css/bootstrap-theme.css
	src/css/bootstrap-theme.css.map
	src/css/bootstrap-theme.min.css
	src/css/bootstrap.css
	src/css/bootstrap.css.map
	src/css/bootstrap.min.css
	src/css/custom.css
	src/css/footer.css
	src/css/images/_notes/dwsync.xml
	src/css/images/animated-overlay.gif
	src/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png
	src/css/images/ui-bg_diagonals-thick_20_666666_40x40.png
	src/css/images/ui-bg_flat_10_000000_40x100.png
	src/css/images/ui-bg_glass_100_f6f6f6_1x400.png
	src/css/images/ui-bg_glass_100_fdf5ce_1x400.png
	src/css/images/ui-bg_glass_65_ffffff_1x400.png
	src/css/images/ui-bg_gloss-wave_35_f6a828_500x100.png
	src/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
	src/css/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
	src/css/images/ui-icons_222222_256x240.png
	src/css/images/ui-icons_228ef1_256x240.png
	src/css/images/ui-icons_ef8c08_256x240.png
	src/css/images/ui-icons_ffd27a_256x240.png
	src/css/images/ui-icons_ffffff_256x240.png
	src/css/jquery-ui.css
	src/css/signin.css
	src/dossier_form.php
	src/dossiers.php
	src/fonts/_notes/dwsync.xml
	src/fonts/glyphicons-halflings-regular.eot
	src/fonts/glyphicons-halflings-regular.svg
	src/fonts/glyphicons-halflings-regular.ttf
	src/fonts/glyphicons-halflings-regular.woff
	src/footer.php
	src/header.php
	src/img/_notes/dwsync.xml
	src/img/escheresque.png
	src/img/logo.png
	src/img/zwartevilt.png
	src/index.php
	src/js/_notes/dwsync.xml
	src/js/bootstrap.js
	src/js/bootstrap.min.js
	src/js/jquery-ui.js
	src/js/jquery.js
	src/js/jquery_adress.js
	src/login.php
	src/logout.php
	src/manager/active_dossier.php
	src/manager/delete_audiance.php
	src/manager/delete_dossier.php
	src/manager/delete_salarie.php
	src/manager/delete_soc.php
	src/manager/footer.php
	src/manager/header.php
	src/manager/modif_audiance_form.php
	src/manager/modif_dossier_form.php
	src/manager/modif_sal_form.php
	src/manager/modif_societe_form.php
	src/manager/update_audiance.php
	src/manager/update_dossier.php
	src/manager/update_salarie.php
	src/manager/update_societe.php
	src/salarie_form.php
	src/salaries.php
	src/save_audiance.php
	src/save_dossier.php
	src/save_salarie.php
	src/save_societe.php
	src/save_user.php
	src/societe_form.php
	src/societes.php
	src/text.html
	src/user_form.php