Merge remote-tracking branch 'adear11/hotfix/JOINDIN-311'
Merge remote-tracking branch 'adear11/hotfix/JOINDIN-312'
Merge branch 'master' of git://github.com/joindin/joind.in
Merge branch 'master' of git://github.com/joindin/joind.in
adding the timezone helper to event comments as well as talk comments
Bring timezone fixes in for event comments also