Merge "Add guilin branch in demo jjb"