[Issue #193] Internationalization aqquired
[Issue #193] added links to change locale in the navbar
Merge branch 'master' of github.com:MGhanem/smartsoft-13 into C4_m0hamed_C5F2_switch_locales
[Issue #193] added translations for the navbar
[Issue #193] Last chosen locale now stored in session to be retrieved later
Added tabs to the developer backend
fixed formatting errors
fixed routes with scope
removed duplicate devise entry
[Issue #193] Added tests
Language now shown while logged out
Fixed salma's migration
Merge branch 'developer_refactor' into shared_files

Conflicts:
	arability/Gemfile
	arability/app/controllers/backend_controller.rb
	arability/config/routes.rb
Merge branch 'C4_m0hamed_C5F2_switch_locales' into shared_files

Conflicts:
	arability/Gemfile
	arability/app/views/shared/_navbar.html.erb
	arability/config/locales/ar.yml
	arability/config/locales/en.yml
	arability/config/routes.rb
Removes the conflict markers and fixes conflicts
Merge pull request #257 from MGhanem/shared_files

Shared files
Merge pull request #258 from MGhanem/fix_migrations

Fixed salma's migration
[issue #177][MC] conflics in search controller
Revert "Language now shown while logged out"

This reverts commit 816582d711468b10bf4ad3738d664d9e34719d4e.

Conflicts:
	arability/app/views/shared/_navbar.html.erb
Revert "[Issue #193] Added tests"

This reverts commit 60dc959c02e1d8ae69756872c566c54993b2dce3.