shoplist/search_resultテンプレート修正
add missing `echo`
Create migration files to add prefecture areas.
refs #12195 #13316
Merge branch 'development' into migration_fix
Add a Mst_Prefecture_Area model.
refs #12195 #13316
Create seed files to add prefecture areas.
refs #12195 #13316
Create a migration file to add the reservation_number column to the shop_fittings table.
refs #12195 #13424
Modify the Model_Shop_Fitting model.
refs #12195 #13424
Create a migration file to drop a unique key from the shops table.
refs #12195 #13330
管理画面 店舗情報の基本的なCRUD実装
Merge branch 'development' of git.webimpact.co.jp:/home/git/AOKI_EC into development
フロント側共通ヘッダーの店舗検索リンク先設定
店舗試着入力画面の実装(confirm page optimization)  refs #13410
Merge branch 'development' into products_dev

Conflicts:
	fuel/app/classes/model/shop.php
	fuel/app/lang/ja/model.php
Add a migration file to add columns of credit payment.
refs #12195
Add properties for credit payment to the order model.
refs #12195
Add the end processing of credit payment.
refs #13120
Merge branch 'development' into migration_fix
管理画面デザイン修正　refs #13401
Code optimization for check_items_try_flag