Add comments to posts, Set default username
Resolved merge conflicts