添加grunt构建
Merge branch 'master' of https://github.com/leochen36/qmik

Conflicts:
	Gruntfile.js
	package.json