Conflicts:
	openscholar/modules/os/modules/os_boxes/plugins/os_boxes_default.inc