Form fonctionnel sans up
Merge branch 'master' of https://github.com/messinnicolas/pharma

Conflicts:
	PHARMA/PHARMA/form.py
	PHARMA/PHARMA/form.pyc
	PHARMA/PHARMA/models.pyc
	PHARMA/PHARMA/settings.pyc
	PHARMA/PHARMA/templates/transmettre-ordonnance.html
	PHARMA/PHARMA/urls.pyc
	PHARMA/PHARMA/views.py
	PHARMA/PHARMA/views.pyc
	PHARMA/pharma_bdd