backporting touchscreen
start screen with touchscreen buttons
return stimuli not ids
adapt android start screen, new wait method
backport touchscreen_button
bugfix
bugfix
Update _experiment_control.py
Merge pull request #12 from expyriment/android_start_screen

Android start screen
rename touchscreen_buttonbox
Merge branch 'global_mouse' into touchbtn

Conflicts:
	expyriment/control/_experiment_control.py
update
present --> show
touchscreen use global mouse
Merge branch 'global_mouse' into touchbtn
bug mouse
update
update
Changed preload() --> create() and unload() --> destroy()
Merge branch 'touchbtn' into developing