Make some bugs fixed in
	modified:   copasi/trajectory/CHybridMethodODE45.cpp
	modified:   copasi/trajectory/CHybridMethodODE45.h
Merge branch 'master' of git.copasi.org:COPASI

Conflicts:
	copasi/trajectory/CHybridMethodODE45.cpp
	copasi/trajectory/CHybridMethodODE45.h

	modified:   copasi/optimization/COptMethodGA.cpp
	modified:   copasi/optimization/COptMethodGA.h
	modified:   copasi/optimization/COptMethodGASR.cpp
	modified:   copasi/optimization/COptMethodGASR.h
	modified:   copasi/optimization/COptMethodPS.cpp
	modified:   copasi/optimization/COptMethodPS.h
	new file:   copasi/randomGenerator/CPermutation.cpp
	new file:   copasi/randomGenerator/CPermutation.h
	modified:   copasi/randomGenerator/randomGenerator.pro
	modified:   copasi/trajectory/CHybridMethodODE45.cpp
	modified:   copasi/trajectory/CHybridMethodODE45.h
	modified:   copasi/trajectory/CInterpolation.cpp
	modified:   copasi/trajectory/CMakeLists.txt
	modified:   copasi/trajectory/CTrajectoryMethod.cpp
	modified:   copasi/trajectory/CTrajectoryTask.cpp
	modified:   copasi/trajectory/trajectory.pro
	modified:   copasi/utilities/CCopasiMethod.cpp
Added hybridODE54 method.