updates from master
Conflicts:
	Bonsai/gen/org/srge/bonsai/R.java
deleted R JAVA OMG
Merge branch 'master' into disotell
Please enter the commit message for your changes. Lines starting
name change