Implement most tags for main site
Merge branch 'feature/meta-tags' of github.com:akvo/akvo-rsr into release/candidate
Fall back to Akvo logo if org has none
[#259] Reinstated request.app_url in JSONP URL in projects map widget. API should not response on CNAME domains.
Merge branch 'release/2.2.0.2' into develop

Conflicts:
	akvo/templates/partner_sites/widgets/projects_map.html
Merge branch 'feature/meta-tags' of github.com:akvo/akvo-rsr into develop
[#297] Fix activity-status to status conversion
[#237] Add loction-type selector to isti-xslt.xml and use in Location

The conversion used is according to Adrian's second post in issue #237
Add normalize-space() where missing for single line data in
iati-xslt.xml

Daisy seems to append spaces in many places and data sanitation is a
good idea anyway
[#277] Add image caption to imported images for Cordaid

Improve the post_import.py script to include the image caption when
adding images to Cordaid projects
[#266] Use existing Partnership object for Cordaid funding

When updating the Cordaid projects to fully fund them, use the existing
funding partner Partnership object for Cordaid if one exists.
[#300] Fix header Sign in and Register links

Also fix redirects for signout() and index() views to use reverse()
[#298] Hide organistion map when Location coords is 0,0

A number of organisations have a Location object without a proper
coodinate pair, so they get the default coords 0.0, 0.0.

Fix templates to hide the map when this is the case.
Merge branch 'release/candidate' of https://github.com/akvo/akvo-rsr into release/candidate
Fix broken link, by using all tabs instead of spaces
Merge branch 'feature/cordaid_fixes' into release/candidate
[#205] Re-fixes issue with CSS layout in partner sites sign in template.
Update to Release Notes v2.2.0.3
[#266] Fix bug when Cordaid fundin partner funding_amount is None
Merge branch 'release/candidate' of github.com:akvo/akvo-rsr into release/2.2.0.3