fixing the org name in the license
Merge branch 'framework' into exception
Merge branch 'exception' into stream
fixing a few more issues with license
Merge branch 'framework' into exception
Merge branch 'exception' into stream