merge with renrenfed

pull renrenfed to local