Merge branch 'fix/filter-renameupload' of git://github.com/cgmartin/zf2 into feature/3259
added file and class headers
Merge branch 'feature/3259' into develop

Close #3259
Merge branch 'feature/htpasswd' of git://github.com/ezimuel/zf2 into feature/auth-apache-password
[#3243] CS fixes

- trailing whitespace
- add comma after last array element
Merge branch 'feature/auth-apache-password' into develop

Close #3243
Merge branch 'feature/abstract-restful-controller-json-detection' of git://github.com/jvandemo/zf2 into feature/3028
[#3028] Add check for existence of Accept header

- If we don't have an Accept header, we can't test for allowed content type, and
  must return false
Merge branch 'feature/3028' into develop

Close #3028
Merge branch 'issue/lsb-inheritance-fix' of git://github.com/lisachenko/zf2 into hotfix/3307

Conflicts:
	library/Zend/Ldap/Node/RootDse.php
Merge branch 'hotfix/3307'

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

Forward port #3307

Conflicts:
	library/Zend/Code/Generator/DocBlock/Tag/LicenseTag.php
	library/Zend/Code/Generator/DocBlock/Tag/ParamTag.php
	library/Zend/Code/Generator/DocBlock/Tag/ReturnTag.php
Tests for __invoke  parameter
Revert formatting
added abstract response sender

send Headers not uses "headers_sent()" directly
Provide support for more HTTP methods in the AbstractRestfulController

- Adds explicit support for OPTIONS, PATCH, and HEAD
- Adds ability to register handler methods for custom HTTP methods
- Refactors:
  - DRY up identifier retrieval -- added getIdentifier() method
  - DRY up parsing of content body -- added processBodyContent()
  - Moved RESTful method handling out of conditional
Remove abstract keyword from new methods

- Cannot add new abstract methods (BC break); instead, raise exceptions
  if unimplemented.
- Added in missing patch() method.
Add little more fun to console
Merge branch 'master' of git://github.com/deegital/zf2 into PR2807-deegital-master-develop
PR #2807 Added unit tests for hydrator buffer handling

Signed-off-by: Ralph Schindler <ralph.schindler@zend.com>