added COLL_TYPE and STAT_BV
Merge branch 'master' of https://github.com/Ambac/fsOnline

Conflicts:
	Web.config
CALMgenerate
Merge branch 'master' of https://github.com/Ambac/fsOnline

Conflicts:
	Web.config
misc