Merge branch 'develop' of https://github.com/CoHyper/grunt-phonegap-project into develop