流通ステータスの返却済、キャンセルを追加
githubのマスター反映
Merge branch 'addOrderstatus' into merge131211

Conflicts:
	app/views/engineorders/_form.html.erb
使用しないif文の削除
Merge branch 'master' into merge131211

Conflicts:
	doc/r2_scaffold.xlsx