PanoViewLOD and EOGCalibration - added unistd.h include
Merge branch 'master' of github.com:CalVR/calvr_plugins
OsgMovie
* added load menu from config
PanoViewLOD
* fixed message when saving
Points
* fixed memory leak
WaterMaze
* added sample xml file
* added keyboard controls
* added trial logic
* added path writing to file
ElevatorRoom
* added sample config
* updated score text
Maze2
* incorporated AcoustiMaze code
Merge pull request #5 from ehamdan/master

SoundTest changes
SoundPlayer
* updated sound class
* read server info from config
Merge remote-tracking branch 'upstream/master'

Conflicts:
	calit2/WaterMaze/WaterMaze.cpp
	calit2/WaterMaze/WaterMaze.h