work
Merge branch 'master' of github.com:dspiteself/RxJS

Conflicts:
	src/Rx/DisposableTest.js
	src/Rx/VirtualTimeScheduler.js
	src/Rx/testing/mockobserver.js
	src/Rx/testing/testscheduler.js