ルートの整備、その他

お掃除等
Merge remote-tracking branch 'origin/master'

Conflicts:
	api/controllers/RequestController.js
stock_new_edit
StockController
Merge remote-tracking branch 'origin/heishi_stock' into heishi_stock