trying to find bug
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Scope.js
	test/scopeTest.js
watchCollection