Updated grunt
Merge branch 'master' of github.com:endyjasmi/php-dev
Update gitignore