merge code.el and customerCode.el between bil-desktop and org master