啦啦啦，我是厉害小妞，我们的xiaopiu可棒啦！！！！~亲亲多多
Merge branch 'master' of https://github.com/liguorui/xiaopiu

Conflicts:
	css/all.css
	index.html
	js/contr/addInterface.js
	js/extend/jqueryExtend.js
	js/main.js
	js/tool/dragAndAngle.js
	js/tool/undoAndRedo.js