Prepare for 1.4.7 release
Added some missing files from the PEAR install
Merge branch 'master' into report-memory-improvements

Conflicts:
	package.xml
Prepare for 1.5.0RC4 release
The fix for this error now assumes PLUS operators in JS are string concats, like the sniff does. This doesn't make for ideal fixes, but at least doesn't cause a syntax error.
Added: -t parameter to allow defining settings for the chosen standard
Prevent truncating whitespace in the final line of modification.
Fixed: removed duplicate newline
Removed: 2 unnecessary newlines
Fixed bug #20093 : Bug with ternary operator token
Updated changelog and bumped version
Additional fix for bug #20093. Forgot about whitespace.
Fixed bug #20100 : incorrect Function mysql() has been deprecated report
Updated changelog and version
Merge branch 'master' into report-memory-improvements

Conflicts:
	CodeSniffer.php
	package.xml
Merge branch 'report-memory-improvements' into phpcs-fixer

Conflicts:
	CodeSniffer.php
	package.xml
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
Merge branch 'report-memory-improvements' into phpcs-fixer
Merge branch 'phpcs-fixer-spacing' of https://github.com/dereuromark/PHP_CodeSniffer into phpcs-fixer