Merge pull request #2 from ljb8664/master

替换成电控样式，添加授权功能
增加单点登录的接口

1.无缝支持1号版本与2号版本
2.提倡使用MVC接口
Merge remote-tracking branch 'origin/master'

Conflicts:
	Trunk/Site/Syn.SSO/Images/Icon/checkbox.png
	Trunk/Site/Syn.SSO/Images/Icon/indicator.gif
	Trunk/Site/Syn.SSO/Images/Icon/radio.png
	Trunk/Site/Syn.SSO/Scripts/AsyncBox-1.4/skins/Chrome/images/wait.gif
	Trunk/Site/Syn.SSO/Scripts/Flexigrid-1.1/flexigrid.pack.css
	Trunk/Site/Syn.SSO/Scripts/Flexigrid-1.1/images/bg.gif
	Trunk/Site/Syn.SSO/Scripts/Flexigrid-1.1/images/btn-sprite.gif
	Trunk/Site/Syn.SSO/Scripts/Flexigrid-1.1/images/ddn.png
	Trunk/Site/Syn.SSO/Scripts/Flexigrid-1.1/images/dn.png
	Trunk/Site/Syn.SSO/Scripts/Flexigrid-1.1/images/fhbg.gif
	Trunk/Site/Syn.SSO/Scripts/Flexigrid-1.1/images/first.gif
	Trunk/Site/Syn.SSO/Scripts/Flexigrid-1.1/images/hl.png
	Trunk/Site/Syn.SSO/Scripts/Flexigrid-1.1/images/last.gif
	Trunk/Site/Syn.SSO/Scripts/Flexigrid-1.1/images/line.gif
	Trunk/Site/Syn.SSO/Scripts/Flexigrid-1.1/images/load.gif
	Trunk/Site/Syn.SSO/Scripts/Flexigrid-1.1/images/load.png
	Trunk/Site/Syn.SSO/Scripts/Flexigrid-1.1/images/magnifier.png
	Trunk/Site/Syn.SSO/Scripts/Flexigrid-1.1/images/next.gif
	Trunk/Site/Syn.SSO/Scripts/Flexigrid-1.1/images/prev.gif
	Trunk/Site/Syn.SSO/Scripts/Flexigrid-1.1/images/up.png
	Trunk/Site/Syn.SSO/Scripts/Flexigrid-1.1/images/uup.png
	Trunk/Site/Syn.SSO/Scripts/Flexigrid-1.1/images/wbg.gif
	Trunk/Site/Syn.SSO/Scripts/zTree-3.5.12/img/diy/folder-close.gif
	Trunk/Site/Syn.SSO/Scripts/zTree-3.5.12/img/diy/folder-open.gif
	Trunk/Site/Syn.SSO/Themes/Default/form.css
	Trunk/Site/Syn.SSO/Themes/Default/images/box_bg.png
	Trunk/Site/Syn.SSO/Themes/Default/images/del.gif
	Trunk/Site/Syn.SSO/Themes/Default/images/headtab.gif
	Trunk/Site/Syn.SSO/Themes/Default/images/icon/config.gif
	Trunk/Site/Syn.SSO/Themes/Default/images/icon/delete.gif
	Trunk/Site/Syn.SSO/Themes/Default/images/icon/edit.gif
	Trunk/Site/Syn.SSO/Themes/Default/images/icon/movedown.gif
	Trunk/Site/Syn.SSO/Themes/Default/images/icon/moveup.gif
	Trunk/Site/Syn.SSO/Themes/Default/images/plugins/dp/s.gif
	Trunk/Site/Syn.SSO/Themes/Default/images/plugins/flexigrid/title_bg.png
	Trunk/Site/Syn.SSO/Themes/Default/images/plugins/icons/add.png
	Trunk/Site/Syn.SSO/Themes/Default/images/plugins/icons/blank.gif
	Trunk/Site/Syn.SSO/Themes/Default/images/plugins/icons/checkbox_0.gif
	Trunk/Site/Syn.SSO/Themes/Default/images/plugins/icons/checkbox_1.gif
	Trunk/Site/Syn.SSO/Themes/Default/images/plugins/icons/checkbox_2.gif
	Trunk/Site/Syn.SSO/Themes/Default/images/plugins/tree/arrows.gif
	Trunk/Site/Syn.SSO/Themes/Default/images/plugins/tree/cbs.gif
	Trunk/Site/Syn.SSO/Themes/Default/images/plugins/tree/drop-yes.gif

	Trunk/Site/Syn.SSO/Themes/Default/images/plugins/tree/elbow-end-minus-nl.gif

	Trunk/Site/Syn.SSO/Themes/Default/images/plugins/tree/elbow-end-minus.gif

	Trunk/Site/Syn.SSO/Themes/Default/images/plugins/tree/elbow-end-plus-nl.gif

	Trunk/Site/Syn.SSO/Themes/Default/images/plugins/tree/elbow-end-plus.gif
	Trunk/Site/Syn.SSO/Themes/Default/images/plugins/tree/elbow-end.gif
	Trunk/Site/Syn.SSO/Themes/Default/images/plugins/tree/elbow-line.gif

	Trunk/Site/Syn.SSO/Themes/Default/images/plugins/tree/elbow-minus-nl.gif
	Trunk/Site/Syn.SSO/Themes/Default/images/plugins/tree/elbow-minus.gif
	Trunk/Site/Syn.SSO/Themes/Default/images/plugins/tree/elbow-plus-nl.gif
	Trunk/Site/Syn.SSO/Themes/Default/images/plugins/tree/elbow-plus.gif
	Trunk/Site/Syn.SSO/Themes/Default/images/plugins/tree/elbow.gif
	Trunk/Site/Syn.SSO/Themes/Default/images/plugins/tree/leaf.gif
	Trunk/Site/Syn.SSO/Themes/Default/images/plugins/usbox/dropdown.gif
	Trunk/Site/Syn.SSO/Themes/Default/images/title_right.png
	Trunk/Site/Syn.SSO/Themes/Default/images/tree_2.gif
	Trunk/Site/Syn.SSO/Themes/Default/images/tree_3.gif
	Trunk/Site/Syn.SSO/Themes/Default/images/tree_3_hover.gif
	Trunk/Site/Syn.SSO/Themes/Default/index.css
	Trunk/Site/Syn.SSO/Themes/Default/plugins/flexigrid/in.png
	Trunk/Site/Syn.SSO/Themes/Default/plugins/flexigrid/out.png
	Trunk/Site/Syn.SSO/Themes/Default/plugins/tree.css
	Trunk/Site/Syn.SSO/Themes/default/button.css
	Trunk/Site/Syn.SSO/Themes/default/images/icon.gif
	Trunk/Site/Syn.SSO/Themes/default/login.css
	Trunk/Site/Syn.SSO/Themes/default/style.css
更改一个csproject文件中的重复添加项
修改登录页面样式

修改登录页面，以使其符合电控系统的登录样式
增加缺失的样式文件与图片
修改登录环节的BUG
Merge pull request #3 from adayywq/Aday_20141030

修改登录环节的BUG
测试直接提交而不使用Branch
add test2.txt
test1.txt
级联删除、添加Email显示