Updated dev config
Merge remote-tracking branch 'upstream/dev' into chanelsbranch
Edit comments is up. 500 error when trying to delete comments; compiles fine