commiting "local changes"
Merge branch 'master' of https://github.com/smaccm/smaccm

Conflicts:
	fm-workbench/agree/com.rockwellcollins.atc.agree.analysis/src/com/rockwellcollins/atc/agree/analysis/actions/AgreeAction.java