commit DEV branch
commit DEV branch
Merge branch 'MySite_DEV' into MySite_DEV_A

Conflicts:
	public/css/build/page.min.css
	public/css/build/page_ie.min.css
	public/css/build/page_ie6.min.css
	public/js/build/page.min.js
	public/js/build/page.raw.js
dev
dev commit
dev commit
dev commit