Make station_parameter_virtualfields lazy.
Merge branch 'master' of git://github.com/flavour/eden
Fix line-endings: csv module doesn't support Mac ones
Merge branch 'master' of git://github.com/flavour/eden
Restore Add button in User Manager
Merge branch 'master' of git://github.com/flavour/eden
Refactor/simplify S3SQLInlineComponent.extract with fast_select, ability to specify defaults for filtered inline-components (=bug fix DRRPP).
Fix stats aggregate building with scheduler, fix map with spatial DB
Merge branch 'master' of git://github.com/nursix/eden
Merge branch 'master' of git://github.com/flavour/eden