merge
Merge branch 'Shaman' into rbuletc
add validate when add item in goods
Merge remote-tracking branch 'origin/Shaman' into avostudio