fixed merge conflict with Object.js
Merge branch 'master' into Any
Merge pull request #55 from extensibleweb/Any

The Any type and associated tests
fixed merge conflict with Object.js