messing around with the models
Merge branch 'master' of https://github.com/smaccm/smaccm
Merge branch 'master' of https://github.com/smaccm/smaccm
fixing how the "connected" predicate is handled in resolute
Merge branch 'master' of https://github.com/smaccm/smaccm

Conflicts:
	fm-workbench/resolute/com.rockwellcollins.atc.resolute.analysis/src/com/rockwellcollins/atc/resolute/analysis/ResoluteEvaluator.java