Merge branch 'master' of D:\dev\mine\shopservice with conflicts.
fixed bug
fixed bug