Merged with ankit
Unstable commit - still working on the 'reply' button
Still unstable. Going to create a new branch that resets to Ankits, and add my changes in
Still unstable...
Stable. Woah.
I can see the light at the end of the tunnel
Other than File issues, everything is merged now :)
First successful merge.
Last commit. Goodbye, branch.
Merge branch 'testMerge2' into testMerge

Last merge. We're stable (minus File issues)!
Intermediate commit. Added Like and Favorite buttons to SessionViewAdapter
Reverted the changes. Ankit has started a comments branch with preliminary work.
Fixed some merge conflicts. Changed InboxViewAdapter to implement the ViewHolder pattern (AKA listviews can scroll smoothly even with a lot of items).