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

Conflicts:
	foundation/display.x11.impl/src/main/java/org/trinity/foundation/display/x11/impl/XDisplayImpl.java