Remove @package @subpackage @category annotations. Update new CS guidelines for files and class docblocks.
Merge pull request #1067 in master
Merge pull request #1076 in master
Merge pull request #1077
Merge pull request #1077 in develop