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