Refactor Tracker
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/design/frontend/base/default/template/piwikanalytics/piwik.phtml
	package.xml