Fixed bug #20097 : CLI.php throws error in php 5.2
Merge branch 'master' into report-memory-improvements

Conflicts:
	CodeSniffer/Reports/Junit.php
	CodeSniffer/Reports/Xml.php
	package.xml
system-wide composer install instructions
Merge pull request #166 from wimvds/global_composer_install

system-wide composer install instructions
ScopeIndent sniff needed to check codes and types so that string types could be used when overriding the ignore list using a ruleset.xml file. The PSR2 standard uses this new feature to ignore comments when checking indents.
Merge branch 'master' into report-memory-improvements

Conflicts:
	package.xml