last change
last commit
Merge branch 'testing'

Conflicts:
	bin/R.txt
	bin/jarlist.cache
	project.properties