inbox view things
Merge remote-tracking branch 'origin/master'
Inbox now passes message on to detail view
Merge remote-tracking branch 'origin/master'
fixed merge conflict?
Merge remote-tracking branch 'origin/master'