Merge pull request #1 from mumuka/master

mac改动
grunt requirejs OK
Merge pull request #1 from hldzlk/master

gxin