[Issue #193] Redid my work after wrong merge into master
[Issue #193] Added documentation
Merge branch 'master' of github.com:MGhanem/smartsoft-13 into C4_m0hamed_C5F2_switch_locales

Conflicts:
	arability/app/controllers/application_controller.rb
	arability/config/routes.rb
[Issue #193] Removed extra lines
[WIP] Fixed image issues
[Issue #193] added umls
[Issue #193] added umls fixed
Merge branch 'c1s13_adamggg_know_get_prizes' into game_theme

* c1s13_adamggg_know_get_prizes:
  [WIP] Fixed image issues
[#174][WIP] fixed licked to locked
Merge branch 'c1s13_adamggg_know_get_prizes' into game_theme

* c1s13_adamggg_know_get_prizes:
  [#174][WIP] fixed licked to locked
Merge branch 'game_theme' of https://github.com/MGhanem/smartsoft-13 into game_theme

* 'game_theme' of https://github.com/MGhanem/smartsoft-13: (25 commits)
  [#198][WIP] added facebook and twitter logos in hall of fame view
  [issue #166 #167] [WIP] [added documentation]
  [#198][WIP] removed view from authentications and add it to game views
  [#198][WIP] added documentation
  [#199][WIP] changed the get statement in routes
  [#199][WIP] added missing (/div)
  [#199][WIP] moved view from authentications to game
  [#199][WIP] removed method
  [#199][WIP]
  [#198][WIP] added flash messages
  [#198][WIP] added flash messages and handled if not connected to facebook
  [#199][WIP] handled if no common followers with arability gamers
  [#198][WIP] finished implementation
  migration to add token and token secret to gamer
  removed extra spaces
  Readded files that should be in master
  Revert "[Issue #193] Internationalization aqquired"
  Revert "[Issue #193] added links to change locale in the navbar"
  Revert "[Issue #193] added translations for the navbar"
  Revert "[Issue #193] Last chosen locale now stored in session to be retrieved later"
  ...
Merge branch 'C4_m0hamed_C5F2_switch_locales' of https://github.com/MGhanem/smartsoft-13 into game_theme

* 'C4_m0hamed_C5F2_switch_locales' of https://github.com/MGhanem/smartsoft-13:
  [Issue #193] added umls fixed
  [Issue #193] added umls
  [Issue #193] Removed extra lines
  [Issue #193] Added documentation
  [Issue #193] Redid my work after wrong merge into master
Merge branch 'game_theme' of https://github.com/MGhanem/smartsoft-13 into game_theme

* 'game_theme' of https://github.com/MGhanem/smartsoft-13:
  [issue #166 #167][WIP][locking the navbar between transitions]