billing log and book module
resolve conflict and fix book uploading issue