Test added
Merge remote-tracking branch 'upstream/master'
BaseInputFilter fixed
Updated commit method to reset autocommit to true for the adapter.
Updated the order of events to update the inTransaction property first
then to reset the connection autocommit option to true.
Added autocommit = true to rollback method.
Add parent roles with traversable object
Port #3988 to develop
Merge branch 'Mech7-unit-test-preparestatement' into develop
Forward Port #3957
Merge branch 'tux-rampage-hotfix/pdo-oci-platform' into develop
Forward Port #3921
Merge branch 'tux-rampage-hotfix/select-columns-with-table-alias' into develop
fix for issue #3685
Merge branch 'security/2.1.4' into develop

Conflicts:
	README.md
	library/Zend/Version/Version.php
Merge branch 'version/bump' into develop

"merge" version bump from master

Conflicts:
	README.md
	library/Zend/Version/Version.php
Merged Source/Master
Merged Source/Master
Refactored ACL. Fixed tests.
Merge branch 'hotfix/4026' into develop

Forward port #4026
Merge branch 'hotfix/mvc-query-notices' into develop

Fix test "failures" in MVC
Remove "nbproject" directory
Refactored ACL. Fixed tests