More changes to events page - order the category page correctly, and forget about using a local var for categories output on the index page, just reference the model
Merge branch 'staging'