CALMgenerate changes
CALM calculate screen
Merge branch 'master' of https://github.com/Ambac/fsOnline