Merge branch 'master' into company_data

# Conflicts:
#	app/Http/Controllers/Manager/Process/LowPriceGoods.php
#	app/Http/Controllers/Manager/Process/ViolationProduct.php