[Fixing] Fixed populate
Merge branch 'master' of https://github.com/MGhanem/smartsoft-13 into Salma_Fix
[Fixing] Fixed populate
[WIP]modifying my tests for all stories
Merge pull request #517 from MGhanem/Salma_Fix

[Fixing] Fixed populate
[Issue #93][Fixed small issue in the test vote
Merge branch 'master' of https://github.com/MGhanem/smartsoft-13 into tests_with_master
[#361] adds mailer to scoial account users
[Issue #94] Fixed tests
Merge pull request #521 from MGhanem/C4_nourhanZ_C5S06_vote_log

C4 nourhan z c5 s06 vote log
fixing conflicts
fixed admin view
Merge pull request #520 from MGhanem/social_gamer_mailer

[#361] adds mailer to scoial account users
Merge pull request #519 from MGhanem/C2_Omar-Hossam_tests-addition

[WIP]modifying my tests for all stories
Merge pull request #522 from MGhanem/admin_modifications

fixed admin view
Merge pull request #523 from MGhanem/changing_game_nav_styles

fixing conflicts
Merge pull request #524 from MGhanem/C4_m0hamed_S14_AddWordToDatabase

[Issue #94] Fixed tests
fixed tests
[#361] fixes mailer
Merge branch 'master' of https://github.com/MGhanem/smartsoft-13 into timo_fixing_tests