ElevatorRoom added options for experiment paradigms
Merge branch 'master' of https://github.com/CalVR/calvr_plugins

Conflicts:
	calit2/ElevatorRoom/ElevatorRoom.h