[Issue #94] Fixed documentation
[Issue #94] Added new lines in tests
[Issue #94] Fixed umls
[Issue #94] Fixed uml and code conventions
Merge branch 'word_management_theme' of github.com:MGhanem/smartsoft-13 into C4_m0hamed_S14_AddWordToDatabase

Conflicts:
	arability/app/models/keyword.rb
	arability/spec/models/keyword_spec.rb
[Issue #195][WIP] applied new code conventions
Merge branch 'word_management_theme' of https://github.com/MGhanem/smartsoft-13 into C4_NourhanMohamed_S12_advanced_search
[Issue #74][Updating] changed method to match new conventions
[Issue #195][Updating] updated translations in translation files
[issue #177]fixing UML
[Issue #92] Added controller tests
Merge branch 'word_management_theme' of http://github.com/MGhanem/smartsoft-13 into C4_mostafahassaan_C4S10_ListFollowedWords
[Issue #92] Fixed UML
Merge branch 'word_management_theme' of github.com:MGhanem/smartsoft-13 into C4_m0hamed_S11_search_by_category
Merge branch 'word_management_theme' of http://github.com/MGhanem/smartsoft-13 into C4_mostafahassaan_C4S10_ListFollowedWords
Merge remote-tracking branch 'origin/C4_m0hamed_S14_AddWordToDatabase' into C4_m0hamed_S11_search_by_category
[issue #177] commiting for checkout
Merge branch 'C4_mostafahassaan_C4S08_FollowWord' of http://github.com/MGhanem/smartsoft-13 into C4_mostafahassaan_C4S10_ListFollowedWords
Merge branch 'word_management_theme' of http://github.com/MGhanem/smartsoft-13 into C4_mostafahassaan_C4S10_ListFollowedWords
[issue #177] added mailer messege