addPlan favorate_site  function  author wjy
fix merge conflicts
Merge pull request #53 from purejade/master

update