add more gestures.
commented out initializing Nao in Jitter (test) component
fixed all the experiment buttons
Merge branch 'master' of redbird.cs.umanitoba.ca:projects/empathy

Conflicts:
	robot-controller/Nao/NaoMotionList.py
	robot-controller/Study/Empathy.py
	robot-controller/Study/Jitter.py
Merge branch 'master' of redbird.cs.umanitoba.ca:projects/empathy
tested shaping and speed of speech
Added value labels for volume, speech, and shape sliders