Added rectangular border around current page
Merge branch 'current-page-border'

Conflicts:
	src/xo-file.c
	src/xo-misc.h