Correct www_root to wwwRoot.
Merge pull request #172 from cakephp/master-webroot

Correct www_root to wwwRoot.
Added Port to MySQL config array

Added 'port' => '3306', and a comment reminding mamp users to change to
8889
Comments to help MAMP users with DataSources
Comments to help MAMP users
Merge pull request #174 from basementjack/master

Comments to help MAMP users on OSX
Add file and line and more useful debug infos to error output.
Merge pull request #175 from cakephp/master-debug

Add file and line and more useful debug infos to error output.
Add missing use statement.
Add locales path to default app config file.
Merge pull request #177 from cakephp/locale-paths

Add locales path to default app config file.
Update docblock and remove unneeded "use" statement.
Merge pull request #179 from ADmad/master

Update docblock and remove unneeded "use" statement.
don't restrict test classes to fixtures
Merge pull request #180 from cakephp/all-test-classes

don't restrict test classes to fixtures
Correct indentation.
Merge branch 'master' of https://github.com/cakephp/app

Conflicts:
	composer.json
	config/bootstrap.php