Merge remote-tracking branch 'origin/haosun'
fixed add sku and modify sku validation
fixed update company info
fixed bug
fixed bug
working on adding new brand
Merge branch 'master' of https://github.com/ludwiksh/Marksimos into haosun
add final score route
fix production cost calculation
start merge from haosun
megre from haosum