Fix line-endings: csv module doesn't support Mac ones
Restore Add button in User Manager
Merge branch 'master' of git://github.com/flavour/eden
Merge branch 'master' of git://github.com/flavour/ifrc