010.01 Switches working
Merge branch 'alden' of github.com:synthetos/g2 into alden
010.01 change to S6 project file