Fix ignored ids for belongsToMany relations

Fix ids ignored by marshaller for belongsToMany relations.
Fix timeAgo Timezones problem
fix FileEngine, divergent behavior when debug is off or on
cleans up CakeTime::timeAgoInWords and adds option for custom futures string
fixes failing test cases from last CakeTime::timeAgoInWords changes

at b96eb1fb46e2cbd9f2917a8f4e63a4ecf3e569fd
code formatting, fixes PHPCS errors
Improvements to Hash::expand and Hash::merge.

Because of the recursion in these functions, processing very large
arrays would take a very long time. I rewrote the functions to
eliminate any unnecessary recursion and function calls. Large arrays
are now processed much faster.
Fixed coding standard violations.
Merge pull request #4787 from hperrin/master_hash_improvements

Improvements to Hash::expand and Hash::merge. (master)
Fix PHPCS errors.
Merge pull request #4780 from Schlaefer/timeAgoInWords-futureString

adds option for future string to CakeTime::timeAgoInWords & code cleanup
add test to prove requesthandler works correct with Angular wonky accept headers
Merge pull request #4798 from ceeram/2-angular

add test to prove requesthandler works correct with Angular wonky accept...
Revert "add test to prove requesthandler works correct with Angular wonky accept headers"

This reverts commit 8507ef83f175bbf3f6532dc68b6051f0d41acd82.

Incorrect header was used for this test, Cake cannot safely determine correct header.
To get CakePHP to respond with json, you can modify the angular common headers.
Merge pull request #4801 from ceeram/2-accept-revert

Revert "add test to prove requesthandler works correct with Angular wonk...
Update version number to 2.5.5
Update version number to 2.6.0-beta
Remove AS from table aliases.

Having AS causes issues with Oracle. While this is not a core driver,
the AS keyword is not required by any supported driver.

Refs #4830
Fix small typo
Merge pull request #4842 from suzuki86/fix-typo

Fix small typo