Scrollbar and binder fix
Merge branch 'master' of https://github.com/tomatocurry1/TestSamples

Conflicts:
	gen/com/tomato/testsamples/R.java