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...
podsiap
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)!
Changed around xml layout to accomodate textviews to be added beneath for comments
Comments toggle; but needs fixing: 1) TextViews for comments are duplicated each time a SessionView object is created 2) Random session with no comments are displaying comments of another session wtf?
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).
POST comments isn't done yet. I got too tired and will finish tomorrow.
Added 'POST comments/' to API. Added views for the user to add a comment in InboxViewAdapter. getText() will be the bane of my existence...
Added support for POST likes and POST favorites
Updated the endpoint url for likes and sessions