* First attempt to use jade templates in Django
Merge branch 'develop' into feature/report_mailing_redesign

Conflicts:
	design/reports_mailing/src/jade/index.jade
	website/settings/defaults.py
Merge branch 'feature/report_mailing_redesign' into feature/email_notifications_with_recomendations