Merge remote-tracking branch 'origin/master' into RDV
chargement de la vue?
phase 1 - insertion et verification de l availabilite
Enlever la fonction qui load le model
Import projet Laza
adaptation branche Laza
Correction bug ajout RDV
Adition de la bare de navigation
Merge branch 'prendreRDV' into Developpement

Conflicts:
	.htaccess
	application/config/autoload.php
	application/config/config.php
	application/config/database.php
	application/config/template.php
	application/controllers/connexion.php
	application/controllers/rdv.php
	application/views/partials/vw_breadcrumb.php
	application/views/partials/vw_header.php
	application/views/partials/vw_sidebar.php
	application/views/templates/templategeneral.php
	application/views/templates/templatelogin.php
	assets/js/AdminLTE/app.js
	assets/js/jquery.min.js