adjusting joke stream view to allow larger jokes to show up
Merge branch 'master' of https://github.com/dbvictor/bananas

Conflicts:
	gen/com/yahoo/bananas/R.java