Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
[BugFix] 对应tangram的修改，修改magic
[Change] 修改文件编码
change version to 1.0.2.1
merge dev
Merge pull request #204 from xiadengping/master

发布1.0.2.2
Merge branch 'dev'
Merge branch 'dev' of https://github.com/BaiduFE/Magic into dev
Merge branch 'dev' of https://github.com/BaiduFE/Magic into dev
﻿[Bugfix]当宽度被设置到table上时，appendHTML和prependHTML在ie6下会撑开suggestion容器到body边缘
﻿[Bugfix]修复IE6下重复触发selectdate事件的bug
﻿[testcase]优化alert和confirm的用例
﻿[bugfix]去掉日历的快捷键支持
﻿[testcase]修改测试框架，添加用例执行完成后的回调
Merge branch 'dev' of https://github.com/BaiduFE/Magic into dev

Conflicts:
	src/magic/control/ComboBox.js
﻿[Change]恢复提交错误的文件
﻿[Change]恢复提交错误的文件
Merge pull request #237 from jianling/dev

恢复提交错误的文件