Merge pull request #1138 from stevewithington/develop

bug fix: inline edit button display issue