Merge branch 'releaseJan26'

merging release branch
Merge branch 'master' of https://github.com/stephanieguo/friendswap

merging into master`