Merge branch 'grunt-build' into v0.1.0-dev
Merge branch 'v0.1.0-dev'