Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/SCIInstitute/SCIRunGUIPrototype
Merge remote-tracking branch 'upstream/master'
parser tests round 1
fixed parser merge
fixed deletion of _F error
final fix of _F problem I promise
Rename library and add test
Reformat
Start splitting out module factory methods
Now two distinct "factory impls" to avoid merging
Add CalculateFieldData
Add CalcFieldData GUI and other fixes
Add some calcFieldData networks. Closes #138
Merge pull request #502 from collint8/master

Documentation and README. First part of #451
Merge branch 'master' into modules_Io
color click changing
Merge pull request #503 from collint8/master

Closes #451
comment out future tests
added correct object naming convention