Changed general program structure to a polymorph tree instead of templates.  Added a new base Set Class for this, and a Set Manager class.
Merge remote-tracking branch 'origin/master'