Deploy: deactivate supervisor field in appraisals in IFRC template (as it can't currently be left empty)
Merge branch 'master' of git://github.com/flavour/eden
Deploy: fix deploy_assignment_experience deletion cascade, fix experience auto-create
Deploy: also remove appraisals if assignments get deleted.
Newsfeed: bookmarking works via AJAX (ajaxS3 picks up the message
automatically now), and the feed is filterable by Bookmark status
Merge branch 'master' of git://github.com/nursix/eden