Hookup proxy 'this' correctly
better test
Merge pull request #304 from bitovi/view-proxy

View proxy `this` in element callbacks to current context
Fix merge conflict
Merge branch 'master' of git://github.com/bitovi/canjs into develop
Merge branch 'master' of git://github.com/bitovi/canjs into development
Merging
Merging with development, now edge