added new feature for user to update name and email. no password update yet.
added change password feature for users.
implemented jquery to show and hide update password fields
Merge branch 'master' into Christine

Pushing feature updates for user profile and password. Resolving merge conflicts.
Merge pull request #3 from golden-bears-2014/Christine

Christine
Merge pull request #5 from golden-bears-2014/melanie_controller_tests

Melanie controller tests
Merge branch 'master' into melanie_controller_tests