premerge adding my_friends page
Merge branch 'master' of https://github.com/tyc007/project_ice