add conf xptemplate_hook_before_cr
support hook_before_cr
Merge branch 'f.conf' into rc
Merge branch 'f.engine' into rc
Merge branch 'rc'
dist.140315-5b993b4
Merge branch 'dist.140315-5b993b4' into dist