Merge pull request #811 from muffinresearch/add-method-to-tiers

Add method to tiers for optgroups (bugs 882831, 882836)
Fix free<->paid toggling (bug 883785)