[issue #86] [Updated] adds the translations fro the feedback in arabic signup and adds the arabic country drop down
[issue #86] [MC] solves conflicts
Language now shown while logged out
Fixed salma's migration
Merge branch 'developer_refactor' into shared_files

Conflicts:
	arability/Gemfile
	arability/app/controllers/backend_controller.rb
	arability/config/routes.rb
Merge branch 'C4_m0hamed_C5F2_switch_locales' into shared_files

Conflicts:
	arability/Gemfile
	arability/app/views/shared/_navbar.html.erb
	arability/config/locales/ar.yml
	arability/config/locales/en.yml
	arability/config/routes.rb
Removes the conflict markers and fixes conflicts
solving conflicts with the sign up page
Merge branch 'game_theme' of https://github.com/MGhanem/smartsoft-13 into c1_kareemalirahman_c1s7_sign_up

* 'game_theme' of https://github.com/MGhanem/smartsoft-13:
  fixing conflicts
[issue #199][WIP] created branch for story
Merge pull request #257 from MGhanem/shared_files

Shared files
Merge pull request #258 from MGhanem/fix_migrations

Fixed salma's migration
Revert "Language now shown while logged out"

This reverts commit 816582d711468b10bf4ad3738d664d9e34719d4e.

Conflicts:
	arability/app/views/shared/_navbar.html.erb
Revert "[Issue #193] Added tests"

This reverts commit 60dc959c02e1d8ae69756872c566c54993b2dce3.
Revert "[Issue #193] Last chosen locale now stored in session to be retrieved later"

This reverts commit 269de86fc9a4e5787ca1e744deeb904474caa6bc.
Revert "[Issue #193] added translations for the navbar"

This reverts commit bb2d22a4650a89ac362547b349beb1398cc63db7.

Conflicts:
	arability/app/views/shared/_navbar.html.erb
	arability/config/locales/ar.yml
	arability/config/locales/en.yml
Revert "[Issue #193] added links to change locale in the navbar"

This reverts commit 4e9442e156b1d7ad9bab42cd821a2e5b6d77ddd1.

Conflicts:
	arability/config/locales/ar.yml
Revert "[Issue #193] Internationalization aqquired"

This reverts commit bed99929923e6329362dbbc7594bb831c22b2248.

Conflicts:
	arability/config/routes.rb
Merge pull request #263 from MGhanem/fix_master

Fix master
[Issue #193] Redid my work after wrong merge into master