FIX: Need maxInputChnls
FIX: Fix catch
BF: uninitialized variable when drawing ISI
Merge pull request #420 from Eric89GXL/chnl-fix

FIX: Need maxInputChnls
Merge pull request #421 from piwaniuk/isi-draw

BF: uninitialized variable when drawing ISI
ENH: component name validation
ENH: added platform_specific.delaySleep() implementation for OSX
ENH: working on Cedrus button box Component (not finished)
BF: Fix status bar help strings in Builder

Two of the help strings displayed in Builder's status bar were not
correct because they referred to experiment files as python files.
ENH: Fix typos in source comments
Merge pull request #424 from philippwiesemann/fix-builder-statusbar

BF: Fix status bar help strings in Builder
BF: Fix display list leaks in stimuli objects

The OpenGL display lists created by four of the stimuli objects were not
deleted. In most experiments this may not matter because the stimuli are
usually reused instead of being deleted and created again. Still this is
an improvement because it allows PsychoPy to scale better in such cases.
Merge pull request #425 from philippwiesemann/fix-stimuli-displaylist

BF: Fix display list leaks in stimuli objects
ENH: added platform_specific.delaySleep() implementation for OSX
ENH: working on Cedrus button box Component (not finished)
ENH: still working on Cedrus button box Component (not finished)
ENH: Builder now uses wider Components panel by default
BF: Builder reload of previous experiments now working again :-)

Also, brings to front the relevant (ie changed) frame if checkSave dlg is needed
DOCS: changelog
Merge branch 'master' of github.com:peircej/psychopy

Conflicts:
	psychopy/app/builder/components/cedrusBox.py