update
fix disabling input events
Infinity scroll fixed
update
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/input.js
Merge remote-tracking branch 'upstream/master'