[issue #91] [adding gender to edit view
fixed conflicts
adding function call to pass words to vote view
Merge branch 'game_theme' of https://github.com/MGhanem/smartsoft-13 into game_theme
Merge branch 'testing_game_integration' into game_theme