Minor change to select new state
Minor changes to grid_cell
Merge branch 'master' into dev/gridcell

Conflicts:
	grid_cell.c
Added extern variable to header for choosing all possible states
Merge branch 'dev/gridcell'