[Issue #189] added uml
[Issue #189] corrected docs
[Issue #189] corrected code convetions
[Issue #189] fixed umls
Merge branch 'C4_m0hamed_C5F1_send_mail' of github.com:MGhanem/smartsoft-13 into C4_m0hamed_C5F1_send_mail
[#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
[Issue #189] fixed code conventions
Merge branch 'master' of github.com:MGhanem/smartsoft-13 into C4_m0hamed_C5F1_send_mail
[Issue #189] removed useless test file
[Issue #189] fixed test
Merge branch 'add_to_master' of https://github.com/MGhanem/smartsoft-13 into C4_nourhanZ_C4F1_ListOfUnVotedWords
[Issue #93][WIP] completed the tests to covers 100% of the lines
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