scrutinized
scrutinized round 2
fixed some more dock blocks
Merge remote-tracking branch 'origin/master' into codestyle

Conflicts:
	Admin/Admin.php
	Datagrid/ProxyQuery.php
	Filter/Filter.php
	Filter/NumberFilter.php
	Model/ModelManager.php
	Tree/PhpcrOdmTree.php
add a lot more CS fixes and phpdoc cleanups
adjust test to early fail behaviour
Merge pull request #188 from sonata-project/codestyle

Codestyle