lukemesiti/autismconnect — pull request #33 by sammyjopeters (2014-02-26 22:19:29+00:00)
Title: Resolved conflicts with user controller

Should be able to edit and save users on both the admin page and the user-profile-edit page!