Updated ToolPaper fanctl model and FMI example (AtomicityDecomp)
Merge branch 'master' of https://github.com/andyed2003/aegit

Conflicts:
	Exploratory/AtomicityDec3/controllerImpl.bcm
	Exploratory/AtomicityDec3/mb_CMP.bcs
	toolPaper/FanCtrl/EnvNew.bps
	toolPaper/FanCtrl/FanCtrlMachine_implicitContext.bps