Button for toggling between friends/all users added
Merge branch 'master' of https://github.com/woodbury/Musha