Style and phpdoc fixes
More style and phpdoc fixes
Merge pull request #35 from akeneo/style-fixes

Style and phpdoc fixes