Cs fixes
Improved doc block
Re(added) closing tag
Merge pull request #4645 from tersmitten/cs-fixes

Cs fixes
force LF EOL in working directory
Fix Hash::remove() removing data even if the path is not matched
Merge pull request #4704 from HavokInspiration/hash-remove-fix

Fix Hash::remove() removing data even if the path is not matched
Fix UUID primary key columns not being reflected properly.

When UUID columns are converted into varchar(36) they should also be
default = null, null = false.

Fixes #4695
Fix bug in CakeEmail::reset()
Fix tests
Correct a few more misleading assert orders.
Merge pull request #4711 from cakephp/master-email

Fix bug in CakeEmail::reset()
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)
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