[issue #177][WIP] debugging
[issue #177][MC] conflics in locale
[issue #168][Updating] added UML
[issue #172][Updating] added UML
[issue #175][Updating] added UML
[issue #177][Updating] added UML
Merge branch 'word_management_theme' 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_C4S09_UnfollowWord
Merge branch 'word_management_theme' of http://github.com/MGhanem/smartsoft-13 into C4_mostafahassaan_C4S08_FollowWord
Merge branch 'word_management_theme' of http://github.com/MGhanem/smartsoft-13 into C4_mostafahassaan_C4S03_KeywordSynonymChart
Merge branch 'C4_mostafahassaan_C4S08_FollowWord' of http://github.com/MGhanem/smartsoft-13 into C4_mostafahassaan_C4S03_KeywordSynonymChart
Merge branch 'C4_mostafahassaan_C4S09_UnfollowWord' of http://github.com/MGhanem/smartsoft-13 into C4_mostafahassaan_C4S03_KeywordSynonymChart
Merge branch 'C4_mostafahassaan_C4S10_ListFollowedWords' of http://github.com/MGhanem/smartsoft-13 into C4_mostafahassaan_C4S03_KeywordSynonymChart
[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
Merge branch 'word_management_theme' of github.com:MGhanem/smartsoft-13 into C4_m0hamed_S11_search_by_category