Activity v2
Merge remote-tracking branch 'origin/master'

Conflicts:
	com/knowledgeplayers/grar/display/component/container/WidgetContainer.hx