moved getNeighbours to CGrid
Merge remote-tracking branch 'origin/master'