CALMgenerate additional functionality
Merge branch 'master' of https://github.com/Ambac/fsOnline

Conflicts:
	FSonline.csproj