Converted '.extend' to 'class # extends' and prototype calls to super
Merge branch 'master' into convert-extends-to-class
Merge pull request #74 from Connexions/convert-extends-to-class

Converted '.extend' to 'class # extends' and prototype calls to super
Merge branch 'master'
Merge remote-tracking branch 'origin/load-and-addchild' into github-refactor