Integrate salary information import into staff import.
Merge branch 'master' of github.com:flavour/eden
Extend s3.popup.js for foreign controller lookups (=from the opposite
end of the link), fixes AddResourceLink Organisation=>Projects when
projects can have multiple orgs.
NYC: Use inline_table filter_formstyle not Foundation (doesn't work well
with a Bootstrap theme), tweak Groups
Minify