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