[#181][WIP] checked code convetions
[#181][WIP] added missing end in my_subscription causing errors
[#181][WIP] removed unused twitter method
[#181][WIP] updated code conventions
[#199][WIP] corrected place of return statement
Merge branch 'master' of https://github.com/MGhanem/smartsoft-13 into C2_Mirna-Yacout_C2S2_connectToTwitter

Conflicts:
	arability/app/models/my_subscription.rb
[#181][WIP] removed devise omniauth callbacks
Merge branch 'master' of https://github.com/MGhanem/smartsoft-13 into C2_Mirna-Yacout_C2S2_connectToTwitter
[#181][WIP] added email to create_with_omniauth
[#181][MC]
[#181][WIP] updated documentation spacing
[#181][WIP] updated documentation spacing
[#181][WIP] removed facebook connection view
[#181][WIP] correced code in twitter callback
fixing conflicts
Merge branch 'master' of https://github.com/MGhanem/smartsoft-13 into c1_zoheiry_continue_playing
[Issue #85] [WIP] updates developer model
[Issue #85] [WIP] modifies new action in developers controller
[WIP][making gamer able to play after voting on all words, and he doesnt get to vote anymore until new words arrive]
[Issue #85] [WIP] modifies new action in developer controller and changes route for new developer