minor
merge

Merge branch 'master' of https://github.com/HaidongXue/MovSimSMCWorkspace

Conflicts:
	MovSim_SMCDataAssimilation/src/movSimSMC/MovSimState.java
distance() return type changed to double
Merge branch 'master' of https://github.com/HaidongXue/MovSimSMCWorkspace