BF: fixed the long-standing bug with scrolling on the Routine Panel under win32
Merge branch 'master' of github.com:peircej/psychopy

Conflicts:
	psychopy/app/builder/builder.py