on-the-fly alarm vendor / type / CS adding, RT#23694
Merge branch 'master' of git.freeside.biz:/home/git/freeside

Conflicts:
	FS/FS/Mason.pm
	FS/MANIFEST