fixed bug when building the app
Merge branch 'bug-grunt-app' into develop