fix typo
update phpdoc, fix #130, fix #131
Merge pull request #132 from dbu/cleanup-phpdoc

update phpdoc, fix #130, fix #131
Merge branch 'sonata-project/master'