Fixed up some CView2/canvas pacakge references
Merge branch 'master' of https://github.com/foam-framework/foam