fix grunt not found
Merge branch 'travis' into development