Merge remote-tracking branch 'origin/master'

Conflicts:
	decodeGene.m
	initPopulation.m