Fix UserAdmin for site_id
Merge branch 'master' of git://github.com/michaelhowden/eden
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