Merge branch 'master' into dev-sjb
ARRM module functional

The min, max, wave and sync are all working.
Merge branch 'dev-sjb' of https://github.com/sbiickert/g9.2-control into dev-sjb

Conflicts:
	G9
Control.xcodeproj/project.xcworkspace/xcuserdata/Simon.xcuserdatad/UserI
nterfaceState.xcuserstate
	G9 Control/Base.lproj/G9Document.xib
	G9 Control/G9ParameterInfo.m
Merge pull request #1 from sbiickert/dev-sjb

ARRM Module user interface functional