Merge with Neighbor

Merge remote branch 'origin/milenaveneziani/cosim2/new-branch' into xuchongang/cosm2/new-branch
Conflicts:
	Changelog
Merge pull request #1 from LANL-COSIM/xuchongang/cosm2/new-branch

Xuchongang/cosm2/new branch