remove R.java file
Merge iBistuGap from github

Conflicts:
	gen/edu/bistu/data/R.java