adding combinations
adding a new field to combinations
adding rate to combinations
creating a base class for common calculator methods
refactoring some calculation methods
bug fixing: base calculators
improving calculator and generation
Merge branch '2-4-stable'