Remise à niveau
Merge branch 'master' of https://github.com/messinnicolas/pharma

Conflicts:
	.DS_Store
	PHARMA/PHARMA/wsgi.py
	PHARMA/PHARMA/wsgi.pyc
	PHARMA/manage.py
	pharma/lib/python2.7/site-packages/Django-1.5.1-py2.7.egg/django/conf/app_template/models.py
	pharma/lib/python2.7/site-packages/Django-1.5.1-py2.7.egg/django/conf/app_template/tests.py
	pharma/lib/python2.7/site-packages/Django-1.5.1-py2.7.egg/django/conf/app_template/views.py
	pharma/lib/python2.7/site-packages/Django-1.5.1-py2.7.egg/django/conf/project_template/project_name/settings.py
	pharma/lib/python2.7/site-packages/Django-1.5.1-py2.7.egg/django/conf/project_template/project_name/urls.py
Mise en place du gitignore