Merge branch 'develop' of github.com:akvo/akvo-rsr into hotfix/2.1.5.2
[#250] Reporting slightly more generic/reusable in cordaid_org_importer.py.
[#250] Renamed log_to_file() -> log_and_alert() in cordaid_org_importer.py script and added extra information for readability.
[#250] Fixed typos in cordaid_org_importer.py script main routine.
Fixed iso_code -> obj.iso_code reference bug in akvo.rsr.admin.CountryAdmin.
[#250] Fixed CSS positioning problem in partner sites login template.
Updated pip requirements for RSR to ensure hotfix builds: django-filter -> 0.6, django-tastypie -> 0.10.0.
Downgraded django-tastypie to version 0.9.16 since 0.10.0 requires Django 1.5 or newer.
Corrected Python package download path for CI virtualenv builds.
Hotfix 2.1.5.2 update to Release notes
Corrected Date in RN.
[#260] Fix link to RSR registering on partner sites

Since you have to register on RSR we need a link back to the
registration page in RSR on the partner sites sign-in page.

Also fix the link to Drupal content on RSR from same page. Note that
this is a hard coded link that'll probabl need fixing when the new
akvo.org site goes live.
Merge branch 'hotfix/2.1.5.2' of github.com:akvo/akvo-rsr into hotfix/2.1.5.2
Reverted django-tastypie to commit 2b131477 to fix RSR API breaks.
Merge branch 'hotfix/2.1.5.2' of github.com:akvo/akvo-rsr into develop

Conflicts resolved in:
	akvo/cordaid_location_importer.py
	akvo/cordaid_org_importer.py
	akvo/templates/partner_sites/auth/sign-in.html
	scripts/deployment/pip/requirements/2_rsr.txt