commit DEV branch
Merge branch 'MySite_DEV_A' into MySite_DEV

Conflicts:
	public/css/main/common.less
commit DEV branch