use application grunt
Merge branch 'use-application-grunt'