Merge branch 'master' of https://github.com/CRM2014/cf into SabrinaWang
分页栏
用户菜单栏
Signed-off-by: SabrinaWang <673458347@qq.com>
Merge commit '11ee827d33a2111fe848995400f7c9419960f976'

Conflicts:
	WebContent/html/marketing.chance/add.html
	WebContent/html/marketing.chance/assign.html
	WebContent/html/marketing.chance/list.html
	WebContent/html/marketing.plan/execute.html
	WebContent/html/marketing.plan/list.html
	WebContent/html/marketing.plan/make.html
	WebContent/html/statistics/loss.html
	WebContent/html/statistics/service.html
添加AccountAction
Merge branch 'wpy' of git@github.com:CRM2014/cf.git
注释例子
Signed-off-by: 七国军队 <1211412423@qq.com> 秦辉
Merge branch 'qinhui' of git@github.com:CRM2014/cf.git
。。
Signed-off-by: xiaoping <xiaoping>

xml database和报表
Merge branch 'master' of https://github.com/CRM2014/cf into xiaoping
Merge commit '500f36288e1381d2b221b1313b440de3282559bc'
Merge commit '83549ee43dc5bfc2c7cbbaa5a0ff58ca249ac4a8'
Signed-off-by: 陈释荣 <11301119@bjtu.edu.cn>
Merge branch 'Csrr' of git@github.com:CRM2014/cf.git
Merge branch 'master' of https://github.com/CRM2014/cf into xiaoping
页面
Signed-off-by: lovewindy <1063652094@qq.com>