Merge branch 'work' into wip/mikabox

Conflicts:
	openbox/event.c

diff --cc openbox/client.c
Simple merge

diff --cc openbox/client.h
Simple merge

diff --cc openbox/event.c
Simple merge

diff --cc openbox/frame.c
Simple merge

diff --cc openbox/frame.h
Simple merge

diff --cc openbox/screen.c
Simple merge