[Issue #94] Fixed code conventions
[Issue #94] Fixed code conventions
Merge branch 'C4_m0hamed_S14_AddWordToDatabase' of github.com:MGhanem/smartsoft-13 into C4_m0hamed_S14_AddWordToDatabase
Merge branch 'master' of github.com:MGhanem/smartsoft-13 into C4_m0hamed_S14_AddWordToDatabase

Conflicts:
	arability/app/controllers/keywords_controller.rb
[Issue #94] fixed umls
Merge branch 'C4_m0hamed_S11_search_by_category' into C4_m0hamed_S14_AddWordToDatabase
[Issue #94] Added tests for new story
Merge branch 'add_to_master' into C4_m0hamed_S14_AddWordToDatabase

Conflicts:
	arability/Gemfile
[Issue #94] Fixed tests
[Issue #94] Added missing tests
[Issue #94] Fixed tests and added working code
Removed wrongly committed files
[Issue #94] Added gem and styles for autocomplete
[Issue #94] Added uniq atribute to relations between keyword, synonym and category
[Issue #94] Fixed tests and added tests to cover all lines of code
[Issue #94] fixed old test that was failing
[Issue #94] Added code to pass the tests
[Issue #94] Added views
Adde coverage directory to git ignore file
Merge branch 'master' of github.com:MGhanem/smartsoft-13 into C4_m0hamed_S14_AddWordToDatabase

Conflicts:
	arability/app/assets/javascripts/application.js
	arability/app/views/search/search.html.erb
	arability/config/locales/ar.yml
	arability/config/locales/en.yml
	arability/spec/spec_helper.rb