added inbox fxn
Merge branch 'master' of https://github.com/stephanieguo/friendswap into releasefeb19Viv
email threads, map v1
merging
map v2
Merge branch 'master' of https://github.com/stephanieguo/friendswap into releasemar9viv
fixed map fxnality