Merge pull request #1 from zhaoda/master

合并
加我名字- -！

加我名字- -！
Merge pull request #1 from lin-chao/master

加我名字- -！
update grunt uglify version