no message
Merge branch 'master' of https://github.com/hitema-bachdev-2015/palaba

Conflicts:
	includes/bdd.php
Merge branch 'master' of https://github.com/hitema-bachdev-2015/palaba