Add some parameters for VEP room
Merge branch 'remotes/GitHub/master'

Conflicts:
	HardwareParameters.m