dfg
dfsg
Merge branch '3.0' of https://github.com/patrickconroy/cakephp into 3.0-contain-with-finder

Conflicts:
	config/bootstrap.php