[#572] Replaced django.contrib.markup with django_markup
[#572] Re-added 'load url from future'
[#570] Update django-counter requirement

django-counter needed patching to be compatible with Django 1.5+.
This fix refers to the patched version in the pip requirements.
Merge pull request #576 from akvo/feature/du570_upgrade_python_libs

[#570] Update django-counter requirement
[#572] Removed 'load url from future'
[#574] Remove code and templates that was used for the SMS updates
[#574] Remove reference to SmsReporter in rsr/management.py
[#243] Removed location option for project updates
[#574] Merge branch 'feature/django-upgrade' into feature/du574_remove_sms
[#574] Create migration for the SMS removal

The migration deletes the SmsReporter model and the phone_number and
validation fields of the UserProfile.

Also remove the fixture that was only populating models used by the SMS
models.
[#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
Merge pull request #577 from akvo/feature/du574_remove_sms

#574 remove sms
[#564] Merged in feature/django-upgrade
[#564] Added widgets to django-pipeline