Fix navigation
Fix add friend modal
Merge branch 'master' of https://github.com/livestreet/livestreet