fixing vote form
Merge branch 'master' of https://github.com/MGhanem/smartsoft-13 into fixing_vote_form

* 'master' of https://github.com/MGhanem/smartsoft-13:
  [Fixing] Fixed dropdown style in show view
  [#361] bilingual email for social user
  [Fixing] Fixed dropdown style in show view
  aligning all game buttons
  [#361] fixes mailer
  fixed tests
  fixed admin view
  fixing conflicts
  [Issue #94] Fixed tests
  [#361] adds mailer to scoial account users
  [Issue #93][Fixed small issue in the test vote
  [WIP]modifying my tests for all stories
  [Fixing] Fixed populate
  [Fixing] Fixed populate
Merge pull request #530 from MGhanem/fixing_vote_form

fixing vote form