PHP_CodeSniffer changes
Prefer dist
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	composer.json
	src/Stolz/Filters/HtmlTidy/Filter.php
	src/Stolz/Filters/HtmlTidy/ServiceProvider.php
Fixed composer.json
Laravel 4.2 is out