Remove some VFs from Project & modify another to not use extra queries but a Join instead (& limit to just when-needed)
Merge branch 'master' of git://github.com/flavour/eden
Merge branch 'master' of git://github.com/flavour/ifrc
Fix broken unit tests for filtered components.
Added resource selector to OSM import form.
Fix unicode issue in GenericAutocompleteWidget
Remove another VF from Projects to speed up maps (calculate onaccept instead)
Merge pull request #371 from aviraldg/osm-import-select

Added resource selector to OSM import form.
Merge branch 'master' of git://github.com/flavour/eden
Merge branch 'master' of git://github.com/flavour/ifrc
1397
Prefix in S3Resource construction must be explicit (reduces constructor overheads), retain aliasing when constructing a resource from a table or resource, fix uninitialised filter-attribute
Merge branch 'master' of git://github.com/nursix/eden
Survey: Rename Model classes to avoid conflicts (survey_translate wasn't loading with load_all_models()), also do some cleanup
Stdise comment for model returns
i18n fixes
Skip lower/upper on non-text fields.
Have to cleanup LIKE for non-text types :/ (type cast would be better)
Do not send all the default dataTable parameters to the server.
Support AND of multiple queries for the same selector in URLs, +S3FilterForm
Apparently function parameter defaults are a Firefox extension...