Refactor: SupplementController && SupplementsController are now a single module
Merge branch 'master' into feature/cp-improvements