fix hybrid part
Merge remote-tracking branch 'origin/master'

Conflicts:
	hybrid_PSO/Swarm.cpp