Merge branch 'T-Reader' into Facebook
Merge branch 'T-Reader' into Facebook
Revert "Merge branch 'T-Reader' into Facebook"

This reverts commit 8c5bc6ff10784b113ca97d178ffae06c5e5b0aee, reversing
changes made to 0ee781d4e793746235ca09c1c515def476334300.
Sandwich Tree progress
TreeActivity: fixed redraw, reworked lifecycle
Still getting Merge failures

Trying to push it through on console, but having mixed results it seems.