Merge branch 'Phils-Development'
Merge branch 'Phils-Development'
Added new class for keeping generator button widgets together

Added product per second values to game constants
Merge branch 'master' into Phils-Development