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
Adds migration to and an eglish and arabic name to each category
mig
Merge pull request #376 from MGhanem/category_migration

Adds migration to and an eglish and arabic name to each category
Merge pull request #346 from MGhanem/fix_master

Fix master
Merge pull request #392 from MGhanem/mig_to_remove_social_cols_from_gamer

mig
Merge branch 'master' of https://github.com/MGhanem/smartsoft-13 into C4_mostafahassaan_C4S08S09_followUnfollowReopen
[issue #172][issue #175] fixed controller tests