complete message screen added
fix merge conflict
Merge branch 'master' of https://github.com/stevenleung002/pickme