FX-21: fix admin
FX-22: add star mark is missing in Invoice
Merge branch 'master' of github.com:trungnh/magentoce1810
Merge branch 'master' into module