Optimize supplier product association and fix authorization bugs on front end.
Merge remote-tracking branch 'upstream/master'