Fixed bug where companyTag wasn't reset on new ad.

Also fixed tag to not default to a test message
fixed conflict
Merge pull request #72 from elihart/tagFix

Quick company tag fix