Finished integrating Phil's branch into my own. This encompassed updating layouts, adapters, activities, fragments... pretty much everything. The full extent of what I did is too long for this commit message. I also switched over to using the support library for fragments, activities, and some adapters; this is because the one method we really need, Fragment.getChildFragmentManager(), is only available through the support library or API 17+. This allows us to host fragments within fragments, which we need for the design we want.