Merge pull request #1087 from ahomatthew/develop

Added id to inspection and measurement schema