Merge branch 'master' into saclay

Conflicts:
	chimere/admin.py
	chimere/fixtures/initial_data.json
	chimere/forms.py
	chimere/locale/fr/LC_MESSAGES/django.po
	chimere/models.py
	chimere/static/chimere/css/styles.css
	chimere/templates/chimere/detail.html
	chimere/templatetags/chimere_tags.py
	chimere/views.py
	chimere/widgets.py

1 files changed, 1 insertions, 1 deletions

diff --git a/example_project/manage.py b/example_project/manage.py
index 300eab0..301acc2 100755
--- a/example_project/manage.py
+++ b/example_project/manage.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 import os, sys
 from django.core.management import execute_manager
 sys.path.insert(0, os.path.abspath('./..'))