Merge branch 'master-v2.2' into saclay-v2.2

Conflicts:
	static/saclay/css/styles.css
	templates/chimere/detail.html

1 files changed, 1 insertions, 1 deletions

diff --git a/manage.py b/manage.py
index 7bbd479..abb366f 100755
--- a/manage.py
+++ b/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, '/home/nim/Work/chimere-project/chimere/')