add description of simpler database session configuration
Add migration guide stub for 2.5
Docs for `connectOptions` with Router::mapResources()
Merge pull request #696 from rchavik/2.5-map-resources

Docs for `connectOptions` with Router::mapResources()
Merge branch 'master' into 2.5
Update docs for new Hash feature.
Merge branch 'master' into 2.5

Conflicts:
	en/core-utility-libraries/hash.rst
Update pagination docs to not use deprecated Controller::paginate()
Merge branch 'master' into 2.5
Update migration guide for new feature.
Update docs for new option.
Update docs to mention new memcached adapter.
Merge branch 'master' into 2.5
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
Add docs for new features on View.
removed log engine autocreate
wording