Fix multi-select fields in cap_alert and cap_info.
Minor fixes to the request workflow
cleanups from S3Search removal
Merge branch 'master' of git://github.com/nursix/eden
Merge branch 'master' of git://github.com/graeme-f/eden
Fix for default filters & stop disabling merge links in hrm/person (Dominic pls review both)
Improve i18n (cleanup recent CRUD strings changes, etc), add 3 new
languages from IFRC: Nepali, Dari & Pashto (Dari crashes currently - still
fixing that up)
Improve fault tolerance of record merger: establish missing SE links
(doesn't mean we can accept inconsistent DBs now - just that it won't crash anymore)
Merge git://github.com/flavour/eden into EVASS

Conflicts:
	VERSION
	languages/it.py