v0.5.2 modifier and effect
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/model_view/model.dart