Rename groupContainer to inputContainer

I think this will result in nicer conventions once the per input type
containers are added. We'll have templates like `inputContainer` and
`radioContainer` instead of `groupContainer`.

Refs #3651
Add conditional container templates.

Having conditionally used container templates lets developers define
different container HTML for each input type.

Refs #3651
Merge branch 'master' into 2.6
Merge remote-tracking branch 'origin/2.6' into 3.0

Conflicts:
	lib/Cake/Cache/Engine/RedisEngine.php
	lib/Cake/Controller/Component/Acl/AclInterface.php
	lib/Cake/Controller/Component/Acl/DbAcl.php
	lib/Cake/Controller/Component/Acl/IniAcl.php
	lib/Cake/Controller/Component/Acl/PhpAcl.php
	lib/Cake/Core/App.php
	lib/Cake/Model/Behavior/AclBehavior.php
	lib/Cake/Model/Behavior/TranslateBehavior.php
	lib/Cake/Model/Behavior/TreeBehavior.php
	lib/Cake/Model/BehaviorCollection.php
	lib/Cake/Model/Datasource/CakeSession.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/Model/Datasource/Database/Postgres.php
	lib/Cake/Model/Datasource/Database/Sqlserver.php
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/ModelWriteTest.php
	lib/Cake/TestSuite/CakeTestLoader.php
	lib/Cake/TestSuite/CakeTestRunner.php
	lib/Cake/TestSuite/CakeTestSuiteCommand.php
	lib/Cake/TestSuite/ControllerTestCase.php
	lib/Cake/TestSuite/Coverage/BaseCoverageReport.php
	lib/Cake/TestSuite/Coverage/HtmlCoverageReport.php
	lib/Cake/TestSuite/Fixture/CakeTestModel.php
	lib/Cake/TestSuite/Reporter/CakeBaseReporter.php
	lib/Cake/TestSuite/Reporter/CakeHtmlReporter.php
	lib/Cake/Utility/Sanitize.php
	lib/Cake/Utility/Set.php
	lib/Cake/View/Helper/FormHelper.php
	src/Auth/BasicAuthenticate.php
	src/Network/Email/AbstractTransport.php
	src/Network/Email/Email.php
	src/Network/Email/SmtpTransport.php
	src/TestSuite/TestCase.php
	src/Utility/String.php
	src/View/Helper/HtmlHelper.php
	tests/TestCase/View/Helper/HtmlHelperTest.php
Refactor translation functions arguments handeling
Removing derp word
Merge pull request #3691 from cakephp/issue-3689

3.0 - Fix incorrect class being loaded by lazy model loading.
Merge pull request #3692 from MMS-Projects/i18n-refactor

Refactor i18n basics
Fix coding standard violations
Remove unneeded comment out line that I just saw in compare view on GH
Fixes a problem where either the script or css file is not included if they use the same name (e.g. default.css and default.js)
Removing extra code
Add asset to includedAssets after url is resolved
Fix HttpSocket test to actually reset protocols for correct test. Modify HttpSocket so that Https with non-passed in protocol doesn't set it to tcp and fail test.
Fix Hash::extract() not matching 1/0 to true/false.

Historically [prop=1] has matched prop=true as well. This restores that
and also fixes [prop=0] not finding falsey values.

This makes the typing less strict in Hash::extract() but I don't think
it is unreasonable given PHP's type juggling.

Refs #3288
Merge pull request #3701 from dakota/3.0-fix-once

3.0 Fix CSS and Script once option
Automatically marshalling _joinData, fixes #3632
Merge pull request #3698 from cakephp/3.0-save-fixes

3.0 save fixes
Prefixing with an underscore entity accessor methods to avoid confusion and discourange direct access
Add tests for datetime container type.