merged master with discussion log branch.
Merge branch 'feature-discussion-tab-pretty' of github.com:JustDuckItAll/wpi-suite into feature-discussion-tab-pretty