Posts/Comments and minor refactoring, pre-formatting of comment fields
Merge remote-tracking branch 'origin/master'