Merge branch 'master' of https://github.com/haddada/residanat

Conflicts:
	application/controllers/specialite.php
	application/views/menu.php
Merge remote-tracking branch 'origin/master'
resolve
resolve
Merge remote-tracking branch 'origin/master'
improvment