Merge remote branch 'acp.style/master'

Conflicts:
	.travis.yml

diff --cc .travis.yml
index 785349a6148f8d377cacdba3a0f1475ce0f7a0f8,c25b47bbcb8912969d9349d6fb0c711a9fc8839a..8df00cd3a59fb43e09fc4543631f67a5ec9dfd81
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -5,5 -5,7 +5,5 @@@ php
  before_install:
    - pear install pear/PHP_CodeSniffer
    - phpenv rehash
 -before_script:
 -  - git clone --branch=master --depth=1 --quiet git://github.com/WoltLab/WCF.git WCF
  script:
-   - phpcs -p --extensions=php --standard="`pwd`/CodeSniff/WCF" .
 -  - phpcs -p --extensions=php --standard="`pwd`/WCF/CodeSniff/WCF" files
++  - phpcs -p --extensions=php --standard="`pwd`/CodeSniff/WCF" .