fixed bug with Mercury, fixed bug with event countdown clock, added test
for the edge case, updated whitelist to fix Mercury formatting bugs
listening to the dog
Merge pull request #395 from yggie/fixes

Fixes
Merge branch 'develop' of github.com:sampritipanda/WebsiteOne into refactoring

* 'develop' of github.com:sampritipanda/WebsiteOne:
  listening to the dog
  fixed bug with Mercury, fixed bug with event countdown clock, added test for the edge case, updated whitelist to fix Mercury formatting bugs