Attempt to resolve conflict
Merge pull request #557 from Smashman/dev

Add the ability to show hidden comments.