Add docs about merging.
Merge branch '3.0-merge' of github.com:cakephp/docs into 3.0-merge