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
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