Modified the main application layout
Merge branch 'master' of github.com:MGhanem/smartsoft-13 into project_skeleton
Merge branch 'master' of github.com:MGhanem/smartsoft-13 into project_skeleton

Conflicts:
	arability/app/views/layouts/application.html.erb
Added vim .swp files to the gitignore
khloud added details to developer model
noha comitted
khloud fixed developer migration
khloud fixed developer migration
Merge pull request #124 from MGhanem/remove_synonym_f1

noha renamed synonym_id to keyword in searches table
Merge pull request #123 from MGhanem/migration_adding_details_to_developer

khloud added details to developer model
khloud added name to subscription_models
Merge pull request #125 from MGhanem/migration_changing_subscription_models

khloud added name to subscription_models
khloud added subscription model to my_subscriptions
khloud added subscription model to my_subscriptions
Merge pull request #128 from MGhanem/migration_updating_my_subscription

khloud added subscription model to my_subscriptions
Merge branch 'master' of github.com:MGhanem/smartsoft-13 into project_skeleton
added .orig files to git ignore
Merge branch 'master' of https://github.com/MGhanem/smartsoft-13 into C3_SalmaFG_S07
Merge pull request #140 from MGhanem/project_skeleton

Project skeleton
Merge pull request #145 from MGhanem/C3_SalmaFG_S07

Salma wants to merge the working project files to the master