Merge branch 'master' of https://github.com/yexiaochai/blade

Conflicts:
	blade/ui/ui.abstract.view.js
	blade/ui/ui.alert.html
	blade/ui/ui.header.html
	blade/ui/ui.header.js
	blade/ui/ui.image.slider.js
	blade/ui/ui.inputclear2.js
	blade/ui/ui.scroll.layer.html
	blade/ui/ui.tabs.html
	blade/ui/ui.tabs.js
	demo/templates/alert.html
	demo/templates/bubble.layer.html
	demo/templates/filp.html
	demo/templates/reloading.html
	demo/templates/scroll.html
	demo/templates/scroll.layer.html
	demo/templates/warning404.html
	demo/views/filp.js
	demo/views/imageslider.js
	demo/views/reloading.js
	demo/views/scroll.js
	demo/views/scroll.layer.js
	demo/views/warning404.js
	dest/common.js
	dest/ui/ui.alert.html
	dest/ui/ui.scroll.layer.html
	dest/ui/ui.tabs.html
	tank/common/boom.js