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'