fff
Merge branch 'master' of github.com:foright/yami
ffdfd
Merge branch 'master' of github.com:foright/yami

Conflicts:
	templates/beez_20/javascript/brand.js
Merge branch 'master' of github.com:foright/yami