merge anh Viet phan product"
clean repo
some clean