[#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'

Close #3513
Merge branch 'hotfix/3513' into develop

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

- was missing RecursiveIteratorIterator
- Updated copyright year
[#3511] Update copyright on reverted files

- Updates the copyright to 2013 on all files touched by revert
Merge branch 'hotfix/3511' into develop

Close #3511
Fixes #3265
Merge branch 'patch-1' of git://github.com/radnan/zf2 into hotfix/3510