修改

Signed-off-by: Edisonangela <99637859@qq.com>
草草草

Signed-off-by: Edisonangela <99637859@qq.com>
Merge branch 'refs/heads/20131124-1' into 20131124

Signed-off-by: Edisonangela <99637859@qq.com>

Conflicts:
	app/controllers/daoru_controller.rb