Edited edit resource form to show category and subject tables. Edited User admin views and controller. Edited user admin and To Do docs.
Merge branch 'master' of https://github.com/fredriley/Globalhealth