[issue #76] [DONE] Task complete
Merge branch 'master' of http://github.com/MGhanem/smartsoft-13 into C4_mostafahassaan_F7_listUnapprovedSynonyms
[issue #76] [DONE] fixed branch issues, work done
Salma created a new categories_projects mig
[issue #76][DONE] Fixed class << self and added author
[issue #76] [DONE] fixed UML
[Issue #92] Fix spaceing issues in messages partial
Merge branch 'C4_NourhanMohamed_S01_KeywordQuickSearch' of github.com:MGhanem/smartsoft-13 into C4_m0hamed_S11_search_by_category
[Issue #92] Corrected sequence diagram
[Issue #92] Added author to functions
[Issue #92] Updated sequence diagram
Merge branch 'C4_m0hamed_S14_AddWordToDatabase' into C4_m0hamed_S11_search_by_category
Merge remote-tracking branch 'origin/C4_NourhanMohamed_S01_KeywordQuickSearch' into C4_m0hamed_S11_search_by_category
Salma renamed 2 columns in categories_projects
Merge branch 'C3_SalmaFG_S07_Mig' of https://github.com/MGhanem/smartsoft-13 into C3_SalmaFG_S07_Mig
Salma added a mig that renames 2 columns in categories_projects
[Issue #94] Moved author to correct position
Merge branch 'C4_m0hamed_S14_AddWordToDatabase' into C4_m0hamed_S11_search_by_category
Merge remote-tracking branch 'origin/C4_NourhanMohamed_S01_KeywordQuickSearch' into C4_m0hamed_S11_search_by_category
Merge branch 'project_skeleton' of http://github.com/MGhanem/smartsoft-13 into C4_mostafahassaan_F7_listUnapprovedSynonyms