fixed inventory page product line blank
Merge branch 'master' into production