Update test/tools/build_run.xml

修改build_run.xml
Merge branch 'dev'

Conflicts:
	test/tools/build_run.xml
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' of https://github.com/BaiduFE/Magic into dev
新增回到今天插件
﻿[Bugfix]测试工具bugfix
Merge branch 'dev' of https://github.com/BaiduFE/Magic into dev

Conflicts:
	src/magic/Calendar/$timer.js
modify today demo
modify dialog problem about set size operation
﻿[Bugfix]修复Dialog$mask无法dispose的bug
Merge branch 'dev' of http://github.com/BaiduFE/Magic into dev