added sort to inventory
fixed unresolved state changes
fixed resolve issues
Merge branch 'master' into production
pushing to production
to production
to production