oracle transaction support
Merge pull request #3687 branch 'hotfix/phpdoc-return-type'
Zend\Db\Adapter\ParameterContainer
- Fixed ParameterContainer to, upon offsetSet, map int-indexed parameter to named-parameter
Zend\Db\Adapter\ParameterContainer
- Added more tests and a situation for null insertion
Merge branch 'hotfix/3692'

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

Forward port #3692
Merge branch 'hotfix/oracle-transaction' of git://github.com/hamilok/zf2 into hamilok-hotfix/oracle-transaction
Merge branch 'hamilok-hotfix/oracle-transaction' into develop
Fix trailing whitespace in Oci8\Connection class
Merge branch 'cs/fixes'
Merge branch 'cs/fixes' into develop
Restore original travis build

- Restores original travis build script
  - with modification in that it now should use the .php_cs we include
Merge branch 'cs/travis'

Reverted to original travis config as old script format is working again!
Merge branch 'cs/travis' into develop

Reverted to old travis config, as script format is working again!
[2.1.1] Prepare for 2.1.1 release

- Updated README.md with date
- Updated Zend\Version\Version::VERSION
- Updated CHANGELOG.md
Merge branch 'releases/2.1.1'

Ready for 2.1.1 release
Bump version to 2.1.2dev
Merge branch 'version/bump'

Bump to 2.1.2dev
Merge branch 'version/bump' into develop

Merge in changes to changelog for 2.1.1

Conflicts:
	README.md
	library/Zend/Version/Version.php
Adding ANT build configuration and related files