fixes
Merge branch 'master' of https://github.com/MPowered-TechTeam/internal_website