?
Upgrade to cakephp 2
Upgrade to cakephp 2
Use updated plugin paths
?
Merge branch '2.0' of https://github.com/dakota/CakePHP-Asset-Management-Plugin into 2.0

Conflicts:
	View/Elements/css_includes.ctp
	View/Elements/js_includes.ctp
	View/Helper/AssetHelper.php
Fix issue with paths in css assets in a global plugin not being correctly converted
Use correct helper methods
Absolute path should be based on webroot path
Merge branch '2.0'
Add composer file