Merge pull request #1182 from ahomatthew/develop

Fixes SHAN-60
Merge pull request #1184 from sightmachine/develop

Merge pull request #1182 from ahomatthew/develop
Merge pull request #1186 from ahomatthew/SHAN

Fix for all camera on inspection
Update calendar one line fix yay
Merge pull request #1191 from brooksryba/SHAN

Untitled
Merge pull request #1189 from ahomatthew/SHAN

Shan
Fix for tolerance table