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
Refactoring InputTest and FileInputTest
Fix for invalid json in composer for Zend\Math
Update SelectDecorator.php

Class was supporting limit + offset or limit, but only offset does not support
ArrayInput added
Filter and validate each element of an array
Merge branch 'hotfix/4027' into develop

Forward port #4027
Merge branch 'hotfix/4037' into develop

Forward port #4037
Adding code to allow for input validation to continue if value is empty instead of just being marked as valid if empty.  Required to test for validity of an empty value based on context.
Corrected 'supportedDatatypes' array, added some tests
Update InArray.php

in InArray validator
if haystack is an empty array, an exception 'haystack option is mandatory' is thrown
should be exact equality ===




<?php
$t = array();
if ($t == null) echo "null\n"; else echo "not null\n";




this code echoes null




<?php
$t = array();
if ($t === null) echo "null\n"; else echo "not null\n";




this code echoes not null