加入嵌套指令实现的表格和restapi
solve index.html conflicts