Fix Branches being visible on org/branch component view
Cleanups
bugfix
Cleanups.
Move the record merger to the module that says it contains it
typeof support for list:reference
Fix req_req_skill qty=0
Merge branch 'master' of git://github.com/nursix/eden
Fix AddResourceLink unsetting disabled flag
Fix Req requester_id tooltip when not using AC
NYC: Add person popup should be able to create HRs (& auto-set the site_id
when coming from a Request)
NYC: Group Members can be created in popups, tweak the CSS for person
popups to fit the whole HR row in.
typeof: handling of None-values
Apply __typeof to CRMT map layers, more consistency of menus
__typeof not __anyof
Typeof: fallbacks for the case where no hierarchy is configured (1st part)
Typeof: fallback for list:reference if no hierarchy is configured.
Fix: datetime not JSON serializable
Cleanup: Remvoe images from deprecated plugins
IFRC Fix: Staff/Volunteer Record should limit organisation_id to NS only
Add logo for VNRC
Merge https://github.com/flavour/eden into masterLocal
EVASS template updated
Merge pull request #768 from FrancescoMino/master

EVASS template updated
Make backwards-compatible, remove unnecessary bringing T into scope (done
at top of file)