Start new branch rf
Small changes.
Added some settings.
Merge branch 'mc' of https://github.com/evilfer/sciencetoolkit into mc

Conflicts:
	.gitignore
	gen/org/greengin/sciencetoolkit/R.java