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
color click changing
comment out future tests
added correct object naming convention
changed placeHoldingColor_ to private
added override keyword to mouse-connection-color change events
Merge pull request #505 from benjaminlarson/benDragDrop

Closes #498