商品詳細・商品検索の修正
お直しマスタの取得メソッドの修正
Create migration files to add timestamp columns.
refs #12195
Create a migration file to add columns for customer system to customers table.
refs #12195
Merge branch 'development' into products_dev
モデルの再生成
テストコードの修正
Merge branch 'migration_fix' into development
Merge branch 'development' of svn.webimpact.co.jp:/home/git/AOKI_EC into development
お直しのダイアログを固定文言のまま追加
apply new design and code optimization for item_question
fixed bug and add test for item_question
Merge branch 'development' into products_dev
Fix issue of order/create
Fix closing modal issue in order
Add translation.
Add create/edit item alteration function
Merge branch 'products_dev' of wr-dell:/home/git/AOKI_EC into products_dev

Conflicts:
	fuel/app/classes/model/item.php
Remove Q&A mail_template
Fixed when no item alterations can not update item problem