modified Controller Shop, Site And modified Contact Model And modified layout main and shopMain
Merge remote-tracking branch 'origin/master'