[#572] Replaced django.contrib.markup with django_markup
[#572] Re-added 'load url from future'
[#572] Removed 'load url from future'
[#572] Merge branch 'feature/django-upgrade' into feature/du572_markdown

Conflicts:
	akvo/templates/partner_sites/project/update_main.html
	akvo/templates/rsr/project/project_update.html
Merge pull request #573 from akvo/feature/du572_markdown

#572 markdown update
[#574] Merge branch 'feature/django-upgrade' into feature/du574_remove_sms

Conflicts:
	akvo/templates/notification/notice_settings.html
	akvo/templates/rsr/myakvo/navigation.html