Little fixes and Modeling State Artifact
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Release 1
Merge remote-tracking branch 'upstream/master'
fix
conflict resolve
merging conflicts...