Merge pull request #3484 branch 'hotfix/array-to-string-conversion'
Removed all @category, @package, and @subpackage annotations

- Per #2743, and following on #2953 and discussion on the ML
- Also removes empty docblocks, and empty lines at the end of docblocks
- Library only; phpdoc is never run on tests anyways, and did not want to
  potentially create breakage due to test expectations that relied on
  annotations. At this time, all tests pass.
Merge branch 'feature/db-oracle-driver' of git://github.com/ralphschindler/zf2 into feature/3485
[#3485] Strip @category, @package, and @subpackage annotations

- Pre-emptive measure, in light of #3508
- Only on new files
[#3485] Update copyright year

- end at 2013
[#3485] CS fixes

- Trailing whitespace
Merge branch 'feature/3485' into develop

Close #3485
Remove category trait

- Was misspelled as "catagory", so my script missed it.
- also updated year to 2013
More catches from @Maks3w

- Many of the classes had malformed docblocks:

/**
* @package ...
* @subpackage ...
*/

- Some had subversion strings!
Merge branch 'feature/docblock-simplification' into develop
replace native in_array with Stdlib
string/int safe inArray implementation
mark empty value as selected with form select
replace array_merge with ArrayUtils::merge
Revert PR #3088 as discussed in #3265.

- Reverts a9aa0a2
- Reverts df6eb13
- Reverts 1ec40d0
Fixed bug in acl introduced by acca10b6abe74b3ab51890d5cbe0ab8da4fdf7e0
Fixed CS? My local php-cs-fixer did not show any errors
[#3513] CS fixes
Merge branch 'hotfix/3513' into develop

Forward port #3513
Merge branch 'pr/revert-308' of git://github.com/spiffyjr/zf2 into hotfix/3511