Merge remote-tracking branch 'dana/work' into wip/mikabox

Conflicts:
	openbox/place.c
	openbox/place_overlap.c

diff --cc Makefile.am
Simple merge

diff --cc obrender/render.h
Simple merge

diff --cc openbox/actions/moveresizeto.c
Simple merge

diff --cc openbox/actions/resizerelative.c
Simple merge

diff --cc openbox/config.c
Simple merge

diff --cc openbox/event.c
Simple merge

diff --cc openbox/moveresize.c
Simple merge

diff --cc openbox/openbox.c
Simple merge