cleanup
Merge branch 'website_id' of github.com:jirafe/magento-extension into website_id

Conflicts:
	app/code/community/Jirafe/Analytics/Model/Abstract.php