Page commande complétee, pages modifier finies
Merge branch 'master' of https://github.com/markjohnnightingale/mysql-pharma

Conflicts:
	ajax/test-log.txt
	modifier-medicament.php