Annotated model
Annotated models
Lazy load the components bit of the garments page
Added a spinner to avoid heart attacks
Return to POs when coming from garment
Merged conflicts
Merged master into integrating_unicorn