Added enviromental variable tip for debug and deployment
Clarified Containable filtering limitations

It isn't clear when using containable that an INNER JOIN isn't happening when filtering by a deeper level association, when it really is only affecting the subquery. I added an explanation and an example.
Further clarification

Added an example to return the expected results.
Merge branch 'master' into 2.5
Add new method docs + update migration guide.

Change the wording around Security::cipher to more strongly discourage
its use.
Update cookie component docs for aes encryption.
Merge pull request #748 from cakephp/2.5-encrypt

2.5 encrypt docs
Merge pull request #740 from derekperkins/patch-1

Clarified Containable filtering limitations
Move param() to the correct class.
Update html.rst

Clarify how to use named parameters in the "link" method of HTMLHelper.
Merge pull request #754 from NOSLOW/patch-1

Update html.rst
Breaking too long line
Update Model/Behavior callback documentation to be truthful.
Merge pull request #756 from bar/update-callbacks

Update Model/Behavior callback documentation to be truthful.
Added a file copied from original.
Updated .gitignore temporarily

To ignore PhpStorm settings
Translating...
Done.
Rollback .gitignore
Fixed code example, fixes #144


https://cakephp.lighthouseapp.com/projects/43067/tickets/144