roll back
Merge branch 'master' of github.com:mainpage/bishe

Conflicts:
	shop/Site1.Master