BF: In QuestHandler.addResponse(), do not try to replace existing intensity if intensities list is empty.
ENH: switching wx.Color to wx.Colour (for compatibility with wx 2.9.xx)
ENH: Window sends a 'stay awake' signal during flip (win32 and OSX)
FF: cedrus button box code generation from builder
BF: further fix to the extra file-close query dialogs
BF: minor change to installer package
ENH: Custom labels for OK and Cancel buttons in gui.Dlg
Merge pull request #448 from frankpapenmeier/master

ENH: Custom labels for OK and Cancel buttons in gui.Dlg
BF: Fix KeyError when starting Builder experiment

The experiment crashed when starting from Builder and "Experiment info"
contained no field with name "participant", "Participant", "Subject" or
"Observer" but fields with names containing these names. For example if
a field was named "ParticipantID" this showed the dialog asking for the
value but crashed afterwards because "Participant" was looked up. Fault
was that the settings component checked the keys for experiment info by
looking into the serialized form of the dict and found sub strings this
way. This was fixed by using the eval()ed dict to check the keys there.
RF: Shorten similar statements.

An if statement with three similar bodies was changed into a for loop.
Merge branch 'master' of git://github.com/psychopy/psychopy
Merge pull request #449 from philippwiesemann/fix-builder-settings-crash

BF: Fix KeyError when starting Builder experiment
Merge pull request #447 from isolver/master

Misc. iohub related ENH and BF
TESTS: added basic test for running staircase. Needs check on data outputs though
ENH: activated the new Code Component box by Sol.

Also added some space around code panel, to emphasise that this is a dialog still
Merge remote-tracking branch 'upstream/master'
Merge pull request #438 from hoechenberger/master

BF: Do not try to replace existing intensity if intensities list is empty
ENH: change orientation convention in ElementArrayStim to match that of other stimuli
DOC: describe orientation convention in BaseVisualStim and ElementArrayStim
Merge pull request #451 from djmannion/master

ENH,DOC: flip ElementArrayStim ori, and document convention
ENH: builder text flip - better tooltip and value checking