Merge branch 'php_client_cookies' of github.com:claytondaley/piwik into php_client_cookies

Conflicts:
	libs/PiwikTracker/PiwikTracker.php
Merge branch 'php_client_cookies' of github.com:claytondaley/piwik into php_client_cookies

Conflicts:
	libs/PiwikTracker/PiwikTracker.php