Created category model and migration
Created table categories_keywords
Added the keywords association to the category model
Merge pull request #109 from MGhanem/devise_migrations

#86 Added device migrations.
Merge branch 'master' of github.com:MGhanem/smartsoft-13 into create_model_category
Changed the type of developer_id cloumn from string to references
Salma created Project_Category mig
Salma updated mig
Salma created Project_Category mig
Merge pull request #115 from MGhanem/C3_SalmaFG_S07

Salma created Project_Category mig
Merge pull request #112 from MGhanem/fix_migrations

Changed the type of developer_id cloumn from string to references
Merge pull request #111 from MGhanem/create_model_category

Create model category
Merge pull request #98 from MGhanem/project_skeleton

Project skeleton
created company uml folders
Merge pull request #117 from MGhanem/adding_uml_folders

created company uml folders
migration added
Merge pull request #118 from MGhanem/migration_unapproved_synonyms

migration added
removed the developer_id of type string from master
fix spelling mistake
Merge pull request #120 from MGhanem/fix_migrations

removed the developer_id of type string from master