Merge branch 'master' into marty
Merge branch 'master' into marty
Merge branch 'master' into marty
Added back in code for misc accessories, moved update measurements and upload photo to summary screen
Merge branch 'marty'
Revert 5dde0a9..6e8b2d6

This rolls back to commit 5dde0a9c0cd0df4680e6ebd61a0086d8edbf83cf.
removed extra space in wire
Merge branch 'marty'
Revert 6e8b2d6..dd4eb75

This rolls back to commit 6e8b2d61e3b4e0feb689712987017ad6c85015a6.
Merge branch 'Dustin'
Merge branch 'master' into Dustin