Merge changes
Fixed shop form
Merge remote-tracking branch 'origin/master' into development