Bug fix
Merge pull request #398 from ndomar/bugfix

Bugfix
Merge branch 'develop' of https://github.com/ndomar/megasoft-14 into C2_Eslam_#372_improveWebsite