Correct fix
Merge branch 'master' of https://github.com/VishrutMehta/eden
* DRRPP Roles - Access User Profile
* Moved ui_customize before prep to allow customization of prep
* Adding extra fields for Cook Islands (pifacc, jnap & L0)
* Fixing currencies for DRRPP (USD and NZD only for now)
* Specific Theme for DRRPP
Fix UserAdmin for site_id
Merge branch 'master' of git://github.com/michaelhowden/eden
Remove experimental S3Search re-design (does not work with Map search).
Also remove unit tests.
DRRPP Fixes
Users can be based in Branch Sites
Fixed selenium tests
Merge pull request #383 from somayjain/newbranch

Fixed selenium tests
* Support importing of Users with Roles
* Fix Role test
* crud_form for project_framework
* Removed truncate from project_framework datatable
* DRRPP max width for org fields
* DRRPP Fix project stats & links on home page
Cleanup, Minify
Merge branch 'master' of git://github.com/flavour/eden
list_fields for project_framework, fixes to drrp.xsl
Merge branch 'master' of git://github.com/flavour/eden
Bug fixes, S3DataList (preview), S3FilterForm (preview).
Move S3DataTable/S3DataList into separate module.
Cleanups+fixes: defuse dangerous argument passing
s3_rest_controller=>datatable, fix DRRPP custom prep, use S3Represent
instead of s3_represent_id (several, but incomplete), make s3forms
global for s3, etc...
Can not just override the standard-prep's return value!