Add some more specific conditions after encountering errors... + allow translation of ~ file path element.
Allow setting conditionsFile as variable, not string.
Allow translation of ~ storeDirpath.
Merge branch 'master' of git://github.com/psychopy/psychopy
Fix conflicts after merge from official master
Merge branch 'master' of git://github.com/psychopy/psychopy
Fixed oneline text field for Text component.
refs #527
Added OBCIWindow class.
Changed psychopy.visual.Windows class model to new-style.
refs #524
Merge /home/administrator/psychopy
Added showing error log when it is impossible to generate experiment script.
Fixed style.
Added stub for sending tags from experiment code.
Merge remote-tracking branch 'official/master'
Added selectionMask parameter to Mouse Component.
Fixed code generation error when selectionMask was empty.
Changed selectionMask into advanced parameter.
Merge branch 'master' of https://github.com/psychopy/psychopy
Merge branch 'master' into mouse-masking
Fixed missing 'selection' parameter in CSV.
Changed less used parameter to advanced.
Merge branch 'feedback-text'