Merge commit '7684bae'

author Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>

Mon, 10 Oct 2016 12:05:41 +0000 (15:05 +0300)

committer Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>

Mon, 10 Oct 2016 12:06:27 +0000 (15:06 +0300)
author Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Mon, 10 Oct 2016 12:05:41 +0000 (15:05 +0300)
committer Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Mon, 10 Oct 2016 12:06:27 +0000 (15:06 +0300)
diff --cc bundles/org.simantics.modeling/src/org/simantics/modeling/typicals/SyncTypicalTemplatesToInstances.java
Simple merge
author	Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
	Mon, 10 Oct 2016 12:05:41 +0000 (15:05 +0300)
committer	Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
	Mon, 10 Oct 2016 12:06:27 +0000 (15:06 +0300)