Update README.markdown
small fix for makeFriendlyName() when the name finish with a cap it raised an exception
Merge branch 'master' of https://github.com/squizlabs/PHP_CodeSniffer
Merge branch 'master' of https://github.com/jmarcil/PHP_CodeSniffer
Updated changelog
Merge branch 'master' into phpcs-fixer

Conflicts:
	CodeSniffer/Reports/Source.php
	README.markdown
	package.xml