mod
Merge remote-tracking branch 'classes/master'

Conflicts:
	com/xperiment/stimuli/addTrialCounter.as