Merge pull request #2 from tracylv/MySite_DEV_A

commit DEV branch
commit DEV branch
Merge pull request #3 from tracylv/MySite_DEV_A

commit DEV branch
Merge branch 'MySite_DEV_A' into MySite_DEV

Conflicts:
	public/css/build/page.min.css
	public/css/main/common.less
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/css/main/common.less
commit DEV branch
Merge branch 'master' into MySite_DEV