[Issue #193] Fixed documentation
[Issue #193] Fixed uml
[Issue #193] Fixed code convention
Merge branch 'C4_m0hamed_C5F2_switch_locales' of github.com:MGhanem/smartsoft-13 into C4_m0hamed_C5F2_switch_locales
[Issue #92] Added simple autocomplete to categories in search
Merge remote-tracking branch 'origin/master' into C4_m0hamed_S11_search_by_category

Conflicts:
	arability/app/views/layouts/application.html.erb
	arability/app/views/search/search_keywords.html.erb
[Issue #92] renamed categories.js.coffee to .js
[Issue #92] added tag autocomplete=off to typeahead enabled field
Merge branch 'fix_master' into C4_m0hamed_S11_search_by_category
[Issue #92] Fixed typeahead in bootstrap.rtl.js
Fixed errors and remved catchall
[isue #172][issue #175] created ajax follow/unfollow dynamic button
[Issue #92] Converted category model to arabic and english and added seed
[Issue #92] Added tagmanager bootstrap plugin to project
[Issue #92] Added autocomplete with tag functionality in arabic and english
[Issue #92] Fixed the name of the inputs to avoid changing controllers
[Issue #92] fixed controller to work wit new specs of the current model
[Issue #80] finished implementation and documentation of username or email signin
Merge branch 'master' of https://github.com/MGhanem/smartsoft-13 into C4_mostafahassaan_C4S08S09_followUnfollowReopen
[Issue #92] Added failing tests. TDD for the win[D