Creating template
CAKE PHP Framework

Cake PHP framework commit
Merge 'master' of https://github.com/kevb10/blog

Conflicts:
	composer.json
	lib/Cake/Console/ConsoleOutput.php
	lib/Cake/Console/Templates/default/classes/controller.ctp
	lib/Cake/Controller/Component/Acl/IniAcl.php
	lib/Cake/Controller/Component/AclComponent.php
	lib/Cake/Model/Datasource/Database/Sqlserver.php
	lib/Cake/Model/Model.php
	lib/Cake/Network/CakeResponse.php
	lib/Cake/Test/Case/Controller/Component/AclComponentTest.php
	lib/Cake/Test/Case/Network/CakeResponseTest.php
	lib/Cake/Test/Case/Utility/HashTest.php
	lib/Cake/Test/Case/Utility/SecurityTest.php
	lib/Cake/Utility/Hash.php
	lib/Cake/Utility/Validation.php
	lib/Cake/View/Helper/NumberHelper.php