set up dynamic substates on homepage
added server side pagination
wired up pagination on popular page
fix merge conflicts
more merge conflicts resolved