Merge branch 'release/2.2.0.1' of github.com:akvo/akvo-rsr
Merge branch 'release/2.2.0.2'
Merge branch 'release/2.2.0.3'
Merge branch 'release/candidate'
Revert "Add an experimental placeholder footer to admin pages"

This accidentally made it into the release candidate

This reverts commit 0dde43e474fe39be0d942dba5612fe0b20706dd8.
[#338] Fix add new UserProfile

Trying to create a UserProfile from the admin generates a runtime error.

Fix paramter list in SmsReporterInline.get_readonly_fields() where the
problem originates.
Merge pull request #341 from akvo/hotfix/338

Hotfix/338
[refs #337] Updating to use a newer version of djangoembed which includes support for https youtube URLs
Merge branch 'release/candidate' of ssh://github.com/akvo/akvo-rsr into release/candidate
[#343] Fix map pins for API driven maps

The javascript that loads the maps using the API use a hard coded path
to the media root, '/rsr/media/' that doesn't work after the move of
RSR to rsr.akvo.org.

Fix by replacing the path with settings.MEDIA_URL as a context variable.

This also requires some tweaking of URL building to the API in
akvo-maps.js.
Merge pull request #344 from akvo/hotfix/343

Hotfix/343
Updated release date for 2.3.0 in release notes.
Removed Facebook feature details from release notes.

This functionality have been pushed to release 2.3.1.
Merge branch 'release/candidate' of github.com:akvo/akvo-rsr
[#348] Added missing navSeparator.png file, as expected by the new_header.css file.
Merge branch 'release/candidate' of github.com:akvo/akvo-rsr
Merge branch 'feature/git_info' of github.com:akvo/akvo-rsr into release/candidate

Conflicts resolved in:
	akvo/templates/admin/base_site.html
Merge branch 'release/candidate' of github.com:akvo/akvo-rsr
Merge branch 'master' (v2.3.0) of github.com:akvo/akvo-rsr into develop