Merge pull request #50 from belindahare/master

moved around friends and user lists