Corrected navigation, django 1.5.4 security patch

Signed-off-by: David Saradini <david.saradini@me.com>
Changed "Tableau de bord" in "Cockpite"

Signed-off-by: David Saradini <david.saradini@me.com>
Merge branch 'refs/heads/master' into feature/project_dashboard

* refs/heads/master:
  Changed "Tableau de bord" in "Cockpite"
  Corrected navigation, django 1.5.4 security patch

Signed-off-by: David Saradini <david.saradini@me.com>

Conflicts:
	facile_backlog/backlog/views.py
	facile_backlog/core/static/core/css/main.css
	facile_backlog/locale/fr/LC_MESSAGES/django.mo
	facile_backlog/locale/fr/LC_MESSAGES/django.po
	scss/partials/_main.scss