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
 Added Calendar for Datetime search in S3SearchMinMaxWidget
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...
Merge pull request #1 from ptressel/master

Do not send all the default dataTable parameters to the server.
JS noob mistake -- omitted var
Merge pull request #2 from ptressel/master

JS noob mistake -- omitted var
Assets module UAT fixes
Merge branch 'master' of git://github.com/nursix/eden
Minify
Survey: Allow Templates to be deleted (unless used in a Series)
Deprecate project.countries_id (replaced by project_location)
* Add Config Setting to hide Report Filter Options
* Change Project Report Row default option from project.multi_hazard_id -> ~.multi_hazard_id (Dominic - do you have a better solution?)
* Allow Anonymous users to add projects for ANY lead organisation
* Remove Project Rheader
Merge pull request #375 from somayjain/upstream2

 Added Calendar for Datetime search in S3SearchMinMaxWidget