Updated .gitignore to ignore Grunt.
Merge branch 'development'