changes to recipient activity and message activity
fixed merge conflicts
Merge branch 'master' of https://github.com/mattgmarcus/DartCard into PhotoBranch
Finished removing annoying toasts and log.d's