a bit messy with grunt and gh-pages test
Merge branch 'master' into gh-pages