mac updata
Merge branch 'master' of https://github.com/CS76/1JCH

Conflicts:
	build/classes/org/openscience/jch/diversity/DiversityAnalyser$divCalculator.class
	build/classes/org/openscience/jch/diversity/DiversityAnalyser.class
	build/classes/org/openscience/jch/diversity/InitializeDatabase.class
	build/classes/org/openscience/jch/nwchem/Sample.class