Merge branch 'master' of https://github.com/CRM2014/cf into xiaoping
Signed-off-by: xiaoping <xiaoping>
Merge branch 'xiaoping' of git@github.com:CRM2014/cf.git