Make station_parameter_virtualfields lazy.
Merge branch 'master' of git://github.com/flavour/eden
Modified tests to handle datetime, bugfix
DRMP: Updated Content & Labels
Map shows throbber whilst loading
Merge pull request #539 from somayjain/newbranch

Modified tests to handle datetime, bugfix
Cleanup web2py.js, minify
Volunteer Service Record aggregates programme hours. Now we're normally on
Py-2.7, use native OrderedDict where-possible
jQueryUI Popups don't show their contents until iframe is resized. Fix Map
Loader when no callback used.
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
Unit test fixes.
Stats: Also need the original check for aggregation
web2py.js: Need l10n.js support
IFRC: Don'it overwrite field scripts
Msg: typo fix, add Cell Tower to auth.org_site_types
DRMP Fixes
Merge pull request #544 from michaelhowden/master

DRMP Requirements changes