Merge branch 'work' into wip/mikabox

Conflicts:

	openbox/moveresize.c

diff --cc Makefile.am
Simple merge

diff --cc openbox/client.c
Simple merge

diff --cc openbox/client.h
Simple merge

diff --cc openbox/config.c
Simple merge