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
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
Readded files that should be in master
removed extra spaces
Merge pull request #264 from MGhanem/fix_master

Readded files that should be in master
migration to add token and token secret to gamer
Merge pull request #267 from MGhanem/mig_to_add_token_coloumns_to_gamer

migration to add token and token secret to gamer
[MC] Salma merged conflicts