Fixed update race condition by breaking it into updateF[orces] and updateS[tate] hopefully elliminated __syncthreads issues as well
Merged with 565 master
Merge branch 'upstream/master'

Conflicts:
	Part1/src/kernel.cu