Merge pull request #1067 from stevewithington/develop

comments manager edit