Merge pull request #1066 from stevewithington/develop

comments manager edit