working on friendSearch page, syncing early to fix password issue with maartin
Merge branch 'master' of https://github.com/martianmartin/myStream