event phase control in list-view
Merge branch 'phase-control-in-list-view' into dev
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	includes/scene-post/scene-post.lua