Fixed test exceptions for most of tests
Merge branch 'fix_master' of github.com:MGhanem/smartsoft-13 into fix_master
Fixed the padding of the body tag in application.css.scss
Merge pull request #346 from MGhanem/fix_master

Fix master