Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:


	ws_objects/Ew_mainface.pbl.src/w_book_def.srw

ws_objects/Ew_mainface.pbl.src/w_book_def.srw

@@ -62,6 +62,8 @@ event close;call super::close;IF IsValid(w_sys_login_s) THEN
 	long bb
 	bb = 1
 END IF
+
+
 end event
 
 type cb_func from w_publ_edit_choice`cb_func within w_book_def