Make station_parameter_virtualfields lazy.
Merge branch 'master' of git://github.com/flavour/eden
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
Minify
Merge branch 'master' of git://github.com/flavour/eden
Read Simplify tolerance setting in Map Layers. Reduce clustering of
LACRMT demographic layers
DRMP: Disaster & District selection screens -> 2 cols
Merge branch 'master' of git://github.com/flavour/eden
Ability to restrict fields to load in XSLT stylesheets (for optimization of transformed exports)
Fix import_image to Audit, update realm/supers & execute callbacks
DRMP Tweaks & Fix
* s3db/gis.py change is a fix for adding a new office - as when this happens gis_location.name = None for that location