Reply button in tableView WIP
merge conflict'
Merge branch 'master' of github.com:puffball/freebeer