Some bus work.
removing bin/ and gen/
Merge branch 'busfun'

Conflicts:
	res/values/strings.xml