Temp branch - Fixed all merge errors. SP prototype with clock-in and shelving #12

Closed Zeeblur closed 7 years ago