changed shop by merchant to only display active stock
Merge branch 'master' into styleforms
dashboard styled
forms and tables modified
reconciled with Crystal