Merge pull request #6 from foxp2/patch-1

Update ht_mailchimp_360.php
Conflicts:
	catalog/includes/modules/header_tags/ht_mailchimp_360.php

rename original merge osc_db_query() call to tep_db_query()
Fix title

Conflicts:
	catalog/includes/modules/header_tags/ht_mailchimp_360.php

rename original merge osc_db_query() call to tep_db_query()
fix set_function call
fix description