interim commit of by-condition params.
Merge branch 'master' of https://github.com/LabNeuroCogDevel/CogEmoFaceReward