more wip
Merge branch 'actormodel' of github.com:Zubnix/trinityshell into actormodel
more wip