调整文件讨论动画
Merge branch 'release/20141013' of https://github.com/gokuai/fengcloud into release/20141013

Conflicts:
	app/views/send-msg-control.html