Registration & Administration Enhancements
* Fix in s3crud for crash in http://127.0.0.1:8000/eden/admin/user/x/read (auth_user didn't have modified_by)
* bypass default web2py auth for login, profile & register - makes code easier to follow. Should the code for login, profile & register be moved out of controllers/default.py and into s3aaa.py?
* tidy up default.py:def user()
* IFRC Template - registration requires approval
* Merge auth_user field configuration ->
s3aaa.py:configure_user_fields
* Merge user form validation code in s3_register_validation
* Merge register_onaccept, s3_register, user_profile_onaccept user_approve ->  s3_user_approve_onaccept /
s3_user_create_onaccept
* Change user_onaccept -> s3_user_profile_onaccept and move to s3aaa.py
* Don't call user_approve_onaccept until user approved (HRM record was being created for a new user even if they aren't approved)
* s3_link_to_person: Update user's name & email in pr_registry
* registration_organisation_mandatory -> registration_organisation_required (consistent language)
* admin.py user_approve -> s3_approve_user
* s3_verify_email_onaccept -> s3_verify_user_onaccept
* Update user names when the person record is updated
* Fix get_base_location for asset onaccept
Merge branch 'master' of git://github.com/flavour/eden

Resolved Conflicts in:
	controllers/admin.py
	modules/s3/s3crud.py
Merge branch 'master' of git://github.com/flavour/eden
Basic implementation of a framework for embedding components in the main resource CRUD form.
Fixes/workarounds/updates for upcoming DAL/Storage changes / web2py 2.0
Some bug fixes.
PM Tool: apply task list filters only to list views, do not redirect to list after create/update.
Vulnerability - Reports
DataTables - fixes
A few bug fixes
export_poi method, attached to gis_location.
S3ExportPOI is not private.
pre-merge commit: IFRC template tweak (re-enable teams), Vulnerability progress
Merge branch 'master' of git://github.com/nursix/eden
Minify incline_component & refactor minify script. Move remaining project_task_controller options into prep
Merge branch 'master' of git://github.com/graeme-f/eden
Merge branch 'master' of git://github.com/coldblooded01/eden
Registration & Administration Enhancements
* bypass default web2py auth for login, profile & register - makes code easier to follow. Should the code for login, profile & register be moved out of controllers/default.py and into s3aaa.py?
* tidy up default.py:def user()
* IFRC Template - registration requires approval
* Merge auth_user field configuration ->
s3aaa.py:configure_user_fields
* Merge user form validation code in s3_register_validation
* Merge register_onaccept, s3_register, user_profile_onaccept user_approve ->  s3_user_approve_onaccept /
s3_user_create_onaccept
* Change user_onaccept -> s3_user_profile_onaccept and move to s3aaa.py
* Don't call user_approve_onaccept until user approved (HRM record was being created for a new user even if they aren't approved)
* s3_link_to_person: Update user's name & email in pr_registry
* registration_organisation_mandatory -> registration_organisation_required (consistent language)
* admin.py user_approve -> s3_approve_user
* s3_verify_email_onaccept -> s3_verify_user_onaccept
* Update user names when the person record is updated
* Fix get_base_location for asset onaccept
Fix PR autocomplete & IFRC template tweak
Vulnerability fixes for Postgres & missing data
Update jQuery-UI to 1.8.23
Merge branch 'master' of git://github.com/flavour/eden