Implementation of 2D Niggli cell reduction
Merge branch 'master' of https://github.com/henniggroup/gasp

Conflicts:
	src/avogadro/AvogadroEnergy.java
	src/castep/CastepEnergy.java
	src/castep/CastepIn.java
	src/castep/CastepOut.java
	src/castep/CastepTest.java
	src/chemistry/Composition.java
	src/chemistry/CompositionSpace.java
	src/chemistry/Element.java
	src/crystallography/Cell.java
	src/crystallography/Cif2PoscarUtil.java
	src/crystallography/Crystal.java
	src/crystallography/Isotropy.java
	src/crystallography/MixedPhase.java
	src/crystallography/Site.java
	src/crystallography/SpgLib.java
	src/crystallography/SupercellOptimizer.java
	src/dlpoly/DLPolyEnergy.java
	src/ga/ClusterObjFcn.java
	src/ga/ConvergenceCriterion.java
	src/ga/CrystalGA.java
	src/ga/DFTPPEnergy.java
	src/ga/Development.java
	src/ga/Energy.java
	src/ga/EnergyPerAtom.java
	src/ga/FoundStructureCC.java
	src/ga/GAOut.java
	src/ga/GAParameters.java
	src/ga/GAUtils.java
	src/ga/Generation.java
	src/ga/GenericEnergy.java
	src/ga/GeneticAlgorithm.java
	src/ga/GivenSOCreator.java
	src/ga/LammpsEnergy.java
	src/ga/ManualSOCreator.java
	src/ga/NumFunctionEvalsCC.java
	src/ga/NumGensCC.java
	src/ga/NumGensWOImprCC.java
	src/ga/NumStoichsMut.java
	src/ga/ObjFcnFactory.java
	src/ga/ObjectiveFunction.java
	src/ga/OhmmsEnergy.java
	src/ga/Organism.java
	src/ga/Permutation.java
	src/ga/ProbDistSelection.java
	src/ga/Promotion.java
	src/ga/RandomSOCreator.java
	src/ga/RedundancyGuard.java
	src/ga/ResumeSOCreator.java
	src/ga/Selection.java
	src/ga/Slicer.java
	src/ga/StructureDev.java
	src/ga/StructureMut.java
	src/ga/StructureOrg.java
	src/ga/StructureOrgCreator.java
	src/ga/Structures.java
	src/ga/SupercellSOCreator.java
	src/ga/SupercellVariation.java
	src/ga/SurfaceObjFcn.java
	src/ga/UnitsSOCreator.java
	src/ga/ValueAchievedCC.java
	src/ga/Variation.java
	src/gulp/GulpEnergy.java
	src/gulp/GulpPotential.java
	src/gulp/GulpSurrogate.java
	src/mopac/MopacEnergy.java
	src/nanoxtal/NanoxtalMaker.java
	src/optimization/GlobalCompoOpt.java
	src/optimization/GulpEPAObjFcn.java
	src/optimization/OptiSystem.java
	src/optimization/OptimizationMethod.java
	src/optimization/PDObjFcn.java
	src/pdvisual/ColorWheelDialog.java
	src/pdvisual/CompoManualEntryDialog.java
	src/pdvisual/IComputedEntry.java
	src/pdvisual/IPDAnalyzer.java
	src/pdvisual/IPDPlottable.java
	src/pdvisual/ManualComputedEntry.java
	src/pdvisual/MyJmolViewer.java
	src/pdvisual/PDAnalyzer.java
	src/pdvisual/PDAnalyzerFactory.java
	src/pdvisual/PDBuilder.java
	src/pdvisual/PDConvexable.java
	src/pdvisual/PDData.java
	src/pdvisual/PDViewer.java
	src/pdvisual/PseudoPDAnalyzer.java
	src/pdvisual/PseudoPDBuilder.java
	src/pdvisual/PseudoPDData.java
	src/pdvisual/SelectPtsForPDD_IP.java
	src/pdvisual/TernPD3D.java
	src/pdvisual/TernPD3DProj.java
	src/randomsearch/RandomSearchMethod.java
	src/randomsearch/Scratch.java
	src/utility/ArgumentParser.java
	src/utility/BuildDate.java
	src/utility/Constants.java
	src/utility/Pair.java
	src/utility/RandomNumbers.java
	src/utility/Triplet.java
	src/utility/Utility.java
	src/utility/Vect.java
	src/vasp/VaspEnergy.java
	src/vasp/VaspIn.java
	src/vasp/VaspOut.java
Merge conflict