Merge pull request #1 from xspider/master

sync master
add grunt
Merge pull request #5 from miller/master

add grunt