#674 release notes for hotfix
[#673] Fix filter drop-downs for Pages site using keywords

When a Pages site uses keywords to populate performace issues preclude
filtering the datasets used to populate the filter drop downs. This fix
reverts so that the filters are populated using the full datasets when
the site is keyword driven.

To enable this fix the middleware now adds the current partner_site to the
request so it can be determined if the site is keyword driven or not.
[#671] Use relevant projects for partner site global map

Fix the map on the partner site home page so that it uses the actual
queryset of projects for the site instead of all projects associated
with the parter site organisation.

This is needed now that the projects may be selected based on keywords
rather than org association.

Conflicts:
	akvo/rsr/templatetags/maps.py
[#670] Don't delete keywords on IATI import

The keywords for a project should not be deleted when updating a project
using the API IATI import

This might need to be revisited if/when keywords becomme part of the
import, but for now they're managed solely through the admin.
Merge pull request #677 from akvo/feature/670_keyword_management

[#670] Don't delete keywords on IATI import
Merge pull request #675 from akvo/feature/674-releasenotes

#674 release notes for hotfix
Merge pull request #676 from akvo/hotfix/673_pages_filtering

[#673] Fix filter drop-downs for Pages site using keywords
[#680] Hacky solutions for Cordaid script
[#680] Fix pre_import.py when data contains unknown business units

Replace create_cordaid_business_units() with find_cordaid_business_units()
turning the process inside-out so that we loop over the data and lookup
the business units instead of the other way around.

Change create_cats_and_benches() so it logs to file properly
[#680] Make sure Project.primary_location is none for updated projects

When updating Cordaid projects the IATIProjectResource.obj_update
method deletes all related objects so they can be re-created. This leads
to Project.primary_location pointing to a deleted object so we have to
set it to None since QuerySet.delete() does not call Model.delete() for
the individual objects. (For reasons not understood a solution iterating
over the ProjectLocation objects and calling delete() didn't work.)
Merge pull request #681 from akvo/hotfix/680_cordaid_hotfixes

[#680] Cordaid script improvements
Merge pull request #689 from akvo/release/candidate

[#688] Merge RC into develop