Merge branch 'master' of https://github.com/SaschaGalley/grunt-phpcs

Conflicts:
	README.md
Revert "Merge branch 'master' of https://github.com/SaschaGalley/grunt-phpcs"

This reverts commit fb45ef38e78d8a83c7f0c39466fab2cc0e62c7a7.