Invalid sniff codes passed to --sniffs now show a friendly error message (request #20313)
Fixed array types in function docs
Merge branch 'master' into phpcs-fixer

Conflicts:
	CodeSniffer/CLI.php
	CodeSniffer/CommentParser/AbstractDocElement.php
	CodeSniffer/CommentParser/PairElement.php
	CodeSniffer/CommentParser/ParameterElement.php
	CodeSniffer/CommentParser/SingleElement.php
	CodeSniffer/Standards/AbstractPatternSniff.php
	CodeSniffer/Standards/AbstractScopeSniff.php
	CodeSniffer/Standards/PSR1/Tests/Classes/ClassDeclarationUnitTest.php
	CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/ControlSignatureSniff.php
	package.xml
Generic LineLengthSniff now shows a warning if the iconv module is disabled (request #20314)
Merge branch 'master' into phpcs-fixer

Conflicts:
	CodeSniffer/Standards/Generic/Sniffs/Files/LineLengthSniff.php
	package.xml
Fixed bug #20323 : PHPCS tries to load sniffs from hidden directories
Merge branch 'master' into phpcs-fixer
Allow installed_paths to be relative to the phpcs root directory
Support installed_paths w/ user's HOME dir via tilde-prefix
Factor out logic to gather list of installed paths

Use in both getInstalledStandardPath() and getInstalledStandards()
Updated changelog + coding standard fixes
Merge branch 'master' into phpcs-fixer

Conflicts:
	CodeSniffer.php
	package.xml
Check our defaults when an extension doesn't have a tokenizer associated with it
Unit test runner now also test any standards installed under the installed_paths config var
Updated changelog to be clearer
Further fix to Generic ScopeIndentSniff accounting for differnet open tag indents

We previously ignored open tags that were inside conditions, but that broke some type of code. We now keep a stack of open and close tag indents and check which ones cancel each other out.
Merge branch 'master' into phpcs-fixer

Conflicts:
	CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.inc
Added PHP 5.6 to travis
Added phpunit config file
Merge branch 'master' into phpcs-fixer

Conflicts:
	.travis.yml