add js color picker
Merge branch 'master' of https://github.com/NickSocial/SocialWebsite

Conflicts:
	Social Website/Web/HtmlSegment/Administrator/LeftMenu.html
	Social Website/Web/Language/en-us.xml
	Social Website/Web/Language/zh-cn.xml