fixed status being blank, fixed options edit button, changed trash to decommissioned
Merge branch 'develop' of github.com:ActivityRez/ar-framework into 84732228
Merge pull request #123 from ActivityRez/84732228

fixed status being blank, fixed options edit button, changed trash to decommissioned