Removing invalid indentation and trailing whitespace second attempt
Removing invalid indentation and trailing whitespace third attempt
Making Client::addCookie actually support taking a single Header\SetCookie object
fixing indentation
fixing issue 3044: changing visibility of  from private to protected.
Fixing issue 2662: Adding removeHeaders method to Http/Headers for easy removal of all headers in the container
Removing removeHeaders method as clearHeaders exists
Basic support for aggregates in SharedEventManager according to feedback in https://github.com/zendframework/zf2/pull/2819
Updated constructors to accept options array according to AbstractWriter.php to work with logger factory
Zend\Permissions\Rbac roles should inherit parent permissions, not child permissions.

As (logically) stated in documentation "Child role will inherit the permissions of their parent." But current implementation defeats the main purpose on role inheritance, as parent roles will inherit all permissions of their children.

It really should be otherwise :)
attempting to get Travis build to pass
merging in master
StringUtils: tests + fixes + supported encodings for iconv and mbstring
StringUtils: wording: charset -> encoding
fixed wrong typed variable in StringUtils::getWrapper
StringUtils: cs
Merge branch 'security/session-ip-validator' into develop

Forward port fixes for proxy detection

Conflicts:
	README.md
StringUtils: implemented basic functionality into AbstractStringWrapper::convert
StringUtils: hopefully a little better encoding list
StringUtils: hopefully a little better encoding list