add test for user update photo
add test for admin search for neighborhood, user update profile
change pagination theme to foundation
fix conflicts
Merge pull request #64 from SpencerCDixon/test

Test for admin search for neighborhood, user update profile picture