Signed-off-by: 刘梦莹 <11301099@bjtu.edu.cn>
交往记录与历史订单半成品
修改密码Bug
Merge branch 'LiuMengYing' of git@github.com:CRM2014/cf.git

Conflicts:
	WebContent/index.html
Signed-off-by: lovewindy <1063652094@qq.com>
Signed-off-by: SabrinaWang <673458347@qq.com>
Signed-off-by: 陈释荣 <11301119@bjtu.edu.cn>
修改营销管理中的ChanceAction和PlanAction，慎合。。。
warn error
交往记录和历史订单半成品
Merge commit '74a7e317e8b5f244b9d6f941817fee7ff67e811e'
warn error
Merge commit 'fea5c3ae3932b8d7d755c59ba08df8d4cd264ea3'
Merge branch 'qiyu'
Merge commit '8e1a705e3134175dd0f41d12c1f2f4c00b5414e5'

Conflicts:
	src/cf/crm/action/util/MD5Util.java
Signed-off-by: 陈释荣 <11301119@bjtu.edu.cn>
营销管理的开发计划部分添加.entityDevelopment.java未修改。
Signed-off-by: lovewindy <1063652094@qq.com>
Merge commit '7c1ba02b7dbe86ab92efe8a04c5b1b03f3f18637'

Conflicts:
	src/cf/crm/action/marketing/ChanceAction.java
	src/cf/crm/action/marketing/PlanAction.java
	src/cf/crm/action/marketing/struts-marketing.xml
Merge branch 'master' of git@github.com:CRM2014/cf.git into wpy
Signed-off-by: WpyOcean <wokunisa@163.com>